From: Keith F. <ven...@us...> - 2002-01-19 08:26:26
|
Update of /cvsroot/planeshift/planeshift/src/server In directory usw-pr-cvs1:/tmp/cvs-serv30242 Modified Files: psserver.h psserver.cpp Log Message: Added support for chat messages. Index: psserver.h =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/server/psserver.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** psserver.h 2002/01/16 03:33:25 1.2 --- psserver.h 2002/01/19 08:26:23 1.3 *************** *** 26,29 **** --- 26,31 ---- class MsgHandler; // Receive and distributes incoming messages. class psAuthenticationServer; + class ChatManager; + #include "net/client.h" *************** *** 42,54 **** NetThread* GetNetThread() { return serverthread; } - iChat* GetChat() { return chatmanager; } protected: NetThread* serverthread; - iChat* chatmanager; iObjectRegistry* object_reg; CelBase* celbase; MsgHandler* msghandler; psAuthenticationServer *authserver; ClientConnectionSet connections; --- 44,55 ---- NetThread* GetNetThread() { return serverthread; } protected: NetThread* serverthread; iObjectRegistry* object_reg; CelBase* celbase; MsgHandler* msghandler; psAuthenticationServer *authserver; + ChatManager *chatmanager; ClientConnectionSet connections; Index: psserver.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/server/psserver.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** psserver.cpp 2002/01/18 16:52:23 1.5 --- psserver.cpp 2002/01/19 08:26:24 1.6 *************** *** 25,29 **** #include "psserver.h" #include "serverconsole.h" ! //#include "chatmanager.h" #include "net/netthread.h" #include "net/msghandler.h" --- 25,29 ---- #include "psserver.h" #include "serverconsole.h" ! #include "chatmanager.h" #include "net/netthread.h" #include "net/msghandler.h" *************** *** 79,82 **** --- 79,83 ---- authserver = new psAuthenticationServer(msghandler,&connections); + chatmanager = new ChatManager(msghandler,&connections); return true; |