[Gcblue-commits] gcb_wx/include/sim Game.h,1.31,1.32 tcSimState.h,1.18,1.19

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/include/sim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25434/include/sim

Modified Files:
	Game.h tcSimState.h 
Log Message:


Index: tcSimState.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSimState.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** tcSimState.h	29 Feb 2004 22:51:35 -0000	1.18
--- tcSimState.h	7 Apr 2004 00:41:08 -0000	1.19
***************
*** 1,4 ****
  /*
! **  tcSimState.h
  **
  **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
--- 1,4 ----
  /*
! **  @file tcSimState.h
  **
  **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
***************
*** 65,69 ****
  #define SCEN_STRING_LENGTH 1024
  
! /***************** tcSimState ********************/
  class tcSimState
  {
--- 65,71 ----
  #define SCEN_STRING_LENGTH 1024
  
! /**
! * Singleton class that manages core simulation
! */
  class tcSimState
  {
***************
*** 92,95 ****
--- 94,99 ----
      tsScenarioInfo msScenarioInfo;
  
+     static tcSimState* Get(); ///< accessor for singleton instance
+ 
      void AddLaunchedPlatform(long anNewKey, tcGameObject *plaunchingplatform, unsigned anLauncher);
      void AddPlatform(tcGameObject *pplat);
***************
*** 163,170 ****
      void UpdateSensors(void);
      void UpdateWeaponHits(void);
- 
-     tcSimState();
-     virtual ~tcSimState();
  private:
      tcMapData *mpMapData;
      double mfSimTime;
--- 167,174 ----
      void UpdateSensors(void);
      void UpdateWeaponHits(void);
  private:
+     tcSimState();
+     ~tcSimState();
+ 
      tcMapData *mpMapData;
      double mfSimTime;

Index: Game.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/Game.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** Game.h	5 Apr 2004 02:24:29 -0000	1.31
--- Game.h	7 Apr 2004 00:41:08 -0000	1.32
***************
*** 154,158 ****
      tcPopupControl *popupControl; // popup control object
      tcDatabase mcDatabase;
!     tcSimState mcSimState;
      tcMapData mcMapData;
      tcOptions mcOptions;
--- 154,158 ----
      tcPopupControl *popupControl; // popup control object
      tcDatabase mcDatabase;
!     tcSimState *simState;
      tcMapData mcMapData;
      tcOptions mcOptions;