ServerGameThread is no longer a thread.

This commit is contained in:
lotodore
2009-05-31 19:45:20 +00:00
parent b48209a5e4
commit f2bd0c6111
6 changed files with 7 additions and 6 deletions
+2 -2
View File
@@ -80,7 +80,7 @@ HEADERS += \
src/net/servercontext.h \ src/net/servercontext.h \
src/net/serverexception.h \ src/net/serverexception.h \
src/net/serveraccepthelper.h \ src/net/serveraccepthelper.h \
src/net/servergamethread.h \ src/net/servergame.h \
src/net/servergamestate.h \ src/net/servergamestate.h \
src/net/serverlobbythread.h \ src/net/serverlobbythread.h \
src/net/servercallback.h \ src/net/servercallback.h \
@@ -182,7 +182,7 @@ SOURCES += \
src/net/common/servercontext.cpp \ src/net/common/servercontext.cpp \
src/net/common/serverexception.cpp \ src/net/common/serverexception.cpp \
src/net/common/serveraccepthelper.cpp \ src/net/common/serveraccepthelper.cpp \
src/net/common/servergamethread.cpp \ src/net/common/servergame.cpp \
src/net/common/servergamestate.cpp \ src/net/common/servergamestate.cpp \
src/net/common/serverlobbythread.cpp \ src/net/common/serverlobbythread.cpp \
src/net/common/servercallback.cpp \ src/net/common/servercallback.cpp \
@@ -17,7 +17,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#include <net/servergamethread.h> #include <net/servergame.h>
#include <net/servergamestate.h> #include <net/servergamestate.h>
#include <net/serverlobbythread.h> #include <net/serverlobbythread.h>
#include <net/serverexception.h> #include <net/serverexception.h>
+1 -1
View File
@@ -18,7 +18,7 @@
***************************************************************************/ ***************************************************************************/
#include <net/servergamestate.h> #include <net/servergamestate.h>
#include <net/servergamethread.h> #include <net/servergame.h>
#include <net/serverlobbythread.h> #include <net/serverlobbythread.h>
#include <net/receiverhelper.h> #include <net/receiverhelper.h>
#include <net/senderhelper.h> #include <net/senderhelper.h>
+1 -1
View File
@@ -18,7 +18,7 @@
***************************************************************************/ ***************************************************************************/
#include <net/serverlobbythread.h> #include <net/serverlobbythread.h>
#include <net/servergamethread.h> #include <net/servergame.h>
#include <net/serverexception.h> #include <net/serverexception.h>
#include <net/senderhelper.h> #include <net/senderhelper.h>
#include <net/sendercallback.h> #include <net/sendercallback.h>
+2 -1
View File
@@ -21,8 +21,8 @@
#ifndef _SERVERGAMESTATE_H_ #ifndef _SERVERGAMESTATE_H_
#define _SERVERGAMESTATE_H_ #define _SERVERGAMESTATE_H_
#include <net/servergamethread.h>
#include <playerdata.h> #include <playerdata.h>
#include <net/sessionmanager.h>
#ifdef _MSC_VER #ifdef _MSC_VER
@@ -33,6 +33,7 @@
#define SERVER_INITIAL_STATE ServerGameStateInit #define SERVER_INITIAL_STATE ServerGameStateInit
class Game; class Game;
class ServerGameThread;
class PlayerInterface; class PlayerInterface;
class ServerCallback; class ServerCallback;