Update of /cvsroot/gcblue/gcb_wx/include/sim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18876/include/sim
Modified Files:
Game.h tcGameObject.h tcLauncher.h
Log Message:
Index: tcGameObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcGameObject.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** tcGameObject.h 1 May 2004 21:49:24 -0000 1.18
--- tcGameObject.h 29 May 2004 00:11:53 -0000 1.19
***************
*** 145,148 ****
--- 145,150 ----
virtual int SetLaunch(int anLauncher, int anQuantity) {return 9;}
virtual void SetFormation(tsFormationParameters asFP) {}
+
+ static bool IsClientMode() {return clientMode;}
static void SetClientMode(bool state) {clientMode = state;}
static void SetGameObjectDatabase(Database::tcDatabase *db) {database = db;}
Index: tcLauncher.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcLauncher.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcLauncher.h 24 May 2004 00:14:46 -0000 1.1
--- tcLauncher.h 29 May 2004 00:11:53 -0000 1.2
***************
*** 65,68 ****
--- 65,69 ----
unsigned int mnCurrent;
unsigned int mnUncommitted; ///< mnCurrent - mnUncommitted = # pending launch
+ int errorCode; ///< used in multiplayer to pass error code to client
tsGeoPoint msDatum; ///< datum to pass to weapon nav guidance
***************
*** 85,88 ****
--- 86,92 ----
bool CommandInfoMatches(const tcLauncher& launcher);
void CopyCommandInfoFrom(const tcLauncher& launcher);
+
+ int GetErrorCode() const {return errorCode;}
+ void SetErrorCode(int code) {errorCode = code;}
};
#endif
\ No newline at end of file
Index: Game.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/Game.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** Game.h 9 May 2004 20:40:21 -0000 1.36
--- Game.h 29 May 2004 00:11:53 -0000 1.37
***************
*** 266,269 ****
--- 266,272 ----
void InitializeTacticalMap();
+ static tcSoundConsole* messageConsole;
+ static void DisplayMessage(const char* msg);
+
tcGame(const wxPoint& pos, const wxSize& size);
virtual ~tcGame();
|
