[Planeshift-cvs] CVS: planeshift/src/server command.cpp,1.18,1.19 psserver.cpp,1.7,1.8 psserver.h,1.4,1.5

[Matze B. <mat...@us...>]

Update of /cvsroot/planeshift/planeshift/src/server
In directory usw-pr-cvs1:/tmp/cvs-serv24842/src/server

Modified Files:
	command.cpp psserver.cpp psserver.h 
Log Message:
NetBase class cleanups and psNetPersist in server included

Index: command.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/command.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** command.cpp	2002/01/24 20:11:42	1.18
--- command.cpp	2002/01/24 22:53:16	1.19
***************
*** 20,24 ****
  #include "psserver.h"
  #include "net/netthread.h"
! #include "chatmanager.h"
  
  /* shut down the server and exit program */
--- 20,24 ----
  #include "psserver.h"
  #include "net/netthread.h"
! #include "engine/celbase.h"
  
  /* shut down the server and exit program */
***************
*** 79,82 ****
--- 79,100 ----
  }
  
+ int com_loadmap(char *mapname)
+ {
+     if (!strcmp(mapname,"dungeon"))
+     {
+ 	psserver->celbase->CreateTestStuff("dungeon");
+     }
+     else if (!strcmp(mapname,"temple"))
+     {
+ 	psserver->celbase->CreateTestStuff("temple");
+     }
+     else
+     {
+ 	CPrintf("Please choose map temple or dungeon.\n");
+     }
+ 
+     return 0;
+ }
+ 
  /* add all new commands here */
  COMMAND commands[] = {
***************
*** 84,87 ****
--- 102,106 ----
      { "status", com_status, "Displays server status"},
      { "quit", com_quit, "quits the program"},
+     { "loadmap", com_loadmap, "loads a map into the server"},
      { 0, 0, 0 }
  };

Index: psserver.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/psserver.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** psserver.cpp	2002/01/24 21:43:53	1.7
--- psserver.cpp	2002/01/24 22:53:16	1.8
***************
*** 50,54 ****
      CPrintf ("Initialize cel...");
      celbase = new CelBase;
!     if (!celbase->Initialize(object_reg) || !celbase->CreateTestStuff())
      {
          CPrintf ("failed!\n");
--- 50,54 ----
      CPrintf ("Initialize cel...");
      celbase = new CelBase;
!     if (!celbase->Initialize(object_reg))
      {
          CPrintf ("failed!\n");
***************
*** 76,81 ****
      
      msghandler = new MsgHandler;
!     msghandler->Initialize(serverthread);   // Attach to incoming messages.
!     msghandler->StartThread();              // Poll inbound queue
  
      authserver = new psAuthenticationServer(msghandler,&connections);
--- 76,83 ----
      
      msghandler = new MsgHandler;
!     if (!msghandler->Initialize(serverthread))
! 	return false;			    // Attach to incoming messages.
!     if (!msghandler->StartThread())
! 	return false;			    // Poll inbound queue
  
      authserver = new psAuthenticationServer(msghandler,&connections);

Index: psserver.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/psserver.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** psserver.h	2002/01/24 21:43:53	1.4
--- psserver.h	2002/01/24 22:53:16	1.5
***************
*** 45,49 ****
      NetThread* GetNetThread()	{ return serverthread; }
  
! protected:
      NetThread*              serverthread;
      iObjectRegistry*        object_reg;
--- 45,49 ----
      NetThread* GetNetThread()	{ return serverthread; }
  
! //protected:
      NetThread*              serverthread;
      iObjectRegistry*        object_reg;