[Gcblue-commits] gcb_wx/src/sim Game.cpp,1.76,1.77 tcNetworkView.cpp,1.11,1.12 tcSensorMap.cpp,1.7,1.8 tcSimState.cpp,1.41,1.42

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

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

Modified Files:
	Game.cpp tcNetworkView.cpp tcSensorMap.cpp tcSimState.cpp 
Log Message:


Index: tcSimState.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcSimState.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** tcSimState.cpp	27 Apr 2004 01:24:25 -0000	1.41
--- tcSimState.cpp	8 May 2004 21:25:26 -0000	1.42
***************
*** 282,291 ****
  
      // needs to be re-written to use the toLaunch queue
!     for (int i=0;i<nSize;i++) {
          maPlatformState.GetNextAssoc(cmappos,nKey,pplat);
          pplat->Update(mfSimTime);
          {
              tcPlatformObject *pPlatformObj = dynamic_cast<tcPlatformObject*>(pplat);
!             if (pPlatformObj != NULL) {
                  // TODO: investigate possible problem here with off menu click ???
                  pplat->Launch(nNewKey,nLauncher); 
--- 282,293 ----
  
      // needs to be re-written to use the toLaunch queue
!     for (int i=0;i<nSize;i++) 
!     {
          maPlatformState.GetNextAssoc(cmappos,nKey,pplat);
          pplat->Update(mfSimTime);
          {
              tcPlatformObject *pPlatformObj = dynamic_cast<tcPlatformObject*>(pplat);
!             if (pPlatformObj != NULL) 
!             {
                  // TODO: investigate possible problem here with off menu click ???
                  pplat->Launch(nNewKey,nLauncher); 
***************
*** 302,315 ****
      }
      UpdateLaunch();
  
      if (multiplayerMode != MM_CLIENT)
      {
-         mcSensorMap.Update(mfSimTime);
-         UpdateSensors();
          UpdateObjFormations(mfSimTime);
          UpdateObjEngagements(mfSimTime); // FC engagement list and auto launch
      }
  
!     if ((mfSimTime-mfLastTileAgeOut) > 25.4f) {
          mfLastTileAgeOut = mfSimTime;
          mpMapData->AgeOutTiles(mfSimTime);
--- 304,317 ----
      }
      UpdateLaunch();
+     mcSensorMap.Update(mfSimTime);
  
      if (multiplayerMode != MM_CLIENT)
      {
          UpdateObjFormations(mfSimTime);
          UpdateObjEngagements(mfSimTime); // FC engagement list and auto launch
      }
  
!     if ((mfSimTime-mfLastTileAgeOut) > 25.4f) 
!     {
          mfLastTileAgeOut = mfSimTime;
          mpMapData->AgeOutTiles(mfSimTime);
***************
*** 667,733 ****
      }
  }
- /********************************************************************/
- #define MAX_UPDATESENSORS 16
- void tcSimState::UpdateSensors() 
- {
-     /*
-     tcGameObject *pplat;
-     tcSensorState *pSensorState;
-     std::vector<tcSensorState*> *pSS;
-     int nSensors;
-     tnPoolIndex cmappos = maPlatformState.GetStartPosition();
-     tnPoolIndex nSize = maPlatformState.GetCount();
-     mnSensorPlatformCount = GetAllSensorPlatforms(maSensorPlatforms,1024);
  
-     for(int i=0;i<mnSensorPlatformCount;i++) {
-         maPlatformState.Lookup(maSensorPlatforms[i],pplat);
-         if (tcPlatformObject *pPlatformObj = dynamic_cast<tcPlatformObject*>(pplat)) {
-             pSS = pPlatformObj->GetSensorStateArray();
-             nSensors = (int)pSS->size();
-             for (int k=0;k<nSensors;k++) {
-                 pSensorState = pSS->at(k);
-                 if((pSensorState!=NULL)&&(pSensorState->UpdateScan(mfSimTime))) {
-                     switch (pSensorState->mnMode) 
-                     {
-                case SSMODE_FC:
-                case SSMODE_FCSURVEILLANCE:
-                    {
-                        tcRadar *pRadarSS = dynamic_cast<tcRadar*>(pSensorState);
-                        if (pRadarSS) {
-                            UpdateFireControl(pplat,pRadarSS);
-                        }
-                    }
-                case SSMODE_SURVEILLANCE:
-                    if ((dynamic_cast<tcESMSensor*>(pSensorState)&&
-                        (mpUserInfo->IsOwnAlliance(pplat->mnAlliance)))) {
-                            int i = 3;
-                        }
-                        UpdateSurveillance(pplat,pSensorState);
-                        break;
-                default: 
-                    if (dynamic_cast<tcESMSensor*>(pSensorState)) {
-                        int i = 3;
-                    }
-                    break;
-                     } // switch
-                 } // if (pSensorState!=NULL)&&(pSensorState->UpdateScan(mfSimTime))) {
-             } //for(int k
-         }
-         else if (tcMissileObject *pMissileObj = dynamic_cast<tcMissileObject*>(pplat)) {
-             tcRadar *pRadarSS = pMissileObj->GetSensorState();
-             if((pRadarSS!=NULL)&&(pRadarSS->UpdateScan(mfSimTime))) {
-                 switch (pRadarSS->mnMode) {
-                   case SSMODE_SEEKERACQUIRE: // fall through
-                   case SSMODE_SEEKERTRACK:  // fall through
-                   case SSMODE_SEEKERSEARCH:
-                       UpdateSeeker(pplat,pRadarSS);break;
-                   default:break;
-                 } // switch
-             } //
-         } // else if
- 
-     } // for(int i
-     */
- }
  
  /********************************************************************/
--- 669,673 ----
***************
*** 1649,1652 ****
--- 1589,1601 ----
      return 1;
  }
+ 
+ /**
+ * @return pointer to sensor map
+ */
+ tcSensorMap* tcSimState::GetSensorMap()
+ {
+     return &mcSensorMap;
+ }
+ 
  /********************************************************************/
  void tcSimState::GetDescription(long anKey, tcString& s) 

Index: tcNetworkView.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcNetworkView.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** tcNetworkView.cpp	9 Apr 2004 03:08:09 -0000	1.11
--- tcNetworkView.cpp	8 May 2004 21:25:26 -0000	1.12
***************
*** 36,39 ****
--- 36,40 ----
  #include "wxcommands.h"
  #include "tcSimState.h"
+ #include "common/tcOptions.h"
  
  using namespace Gdiplus;
***************
*** 171,174 ****
--- 172,176 ----
  {
      ipText = event.GetString().c_str();
+     tcOptions::Get()->SetOptionString("HostAddress", ipText.c_str());
  }
  
***************
*** 258,262 ****
      ipEdit->SetCommand(1);
      ipEdit->SetClearOnReturn(false);
!     ipEdit->SetBuffer("");
  
      // read status box parameters
--- 260,272 ----
      ipEdit->SetCommand(1);
      ipEdit->SetClearOnReturn(false);
! 
!     if (!tcOptions::Get()->OptionStringExists("HostAddress"))
!     {
!         tcOptions::Get()->SetOptionString("HostAddress", "192.168.0.100");
!     }
!     ipEdit->SetBuffer(tcOptions::Get()->GetOptionString("HostAddress"));
!     ipText = tcOptions::Get()->GetOptionString("HostAddress");
! 
!     
  
      // read status box parameters

Index: tcSensorMap.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcSensorMap.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcSensorMap.cpp	16 Feb 2004 01:06:23 -0000	1.7
--- tcSensorMap.cpp	8 May 2004 21:25:26 -0000	1.8
***************
*** 27,30 ****
--- 27,31 ----
  #include "tcSimState.h"
  #include "tcWeaponObject.h"
+ #include "common/tcObjStream.h"
  
  using namespace Sensor;
***************
*** 35,38 ****
--- 36,84 ----
  
  /**
+ * Loads state from update stream
+ */
+ tcUpdateStream& tcSensorMapTrack::operator<<(tcUpdateStream& stream)
+ {
+     tcTrack::operator<<(stream);
+ 
+     stream >> mnContributors;
+     for (int n = 0; n < mnContributors; n++)
+     {
+         stream >> maSensorReport[n].mfTimestamp;
+     }
+ 
+     return stream;
+ }
+ 
+ /**
+ * Saves state to update stream
+ */
+ tcUpdateStream& tcSensorMapTrack::operator>>(tcUpdateStream& stream)
+ {
+     tcTrack::operator>>(stream);
+ 
+     stream << mnContributors;
+     for (int n = 0; n < mnContributors; n++)
+     {
+         stream << maSensorReport[n].mfTimestamp;
+     }
+ 
+     /*
+     double mfLastUpdateTime;
+     tcSensorReport maSensorReport[MAX_SENSOR_REPORTS]; // most recent data from contributing sensors
+     int mnContributors;
+     tsEmitterInfo maEmitterInfo[MAX_EMITTERS];
+     int mnEmitters;
+     tnPoolIndex mnDatabaseID; // database ID of track
+     float matchupRating; ///< matchup rating for platforms that have targeted this track
+     float expectedDamage; ///< rating of expected fractional damage of weapons launched at target, 0 - none, 1.0 - totally destroyed
+     float assessedDamage; ///< fractional damage assessment
+     std::vector<long> intercepts; ///< vector of platform ids that are intercepting this track
+     std::vector<long> engaged; ///< vector of weapon ids that are tracking / engaging
+     */
+     return stream;
+ }
+ 
+ /**
  * @return false if id already in engaged vector
  */
***************
*** 396,399 ****
--- 442,509 ----
  
  /******************************* tcAllianceSensorMap ****************************/
+ 
+ /**
+ * Loads state from update stream.
+ */
+ tcUpdateStream& tcAllianceSensorMap::operator<<(tcUpdateStream& stream)
+ {
+     long nTrackID;
+     
+     while ((stream >> nTrackID).eof() == false)
+     {
+         long nIdx = maTrackToSensorTrack[nTrackID];
+         if (nIdx == NULL_INDEX)
+         {
+             tcSensorMapTrack *psmtrack = new tcSensorMapTrack();
+             long nKey;
+             maTrack.AddElement(psmtrack, nKey);
+             maTrackToSensorTrack[nTrackID] = nKey;
+             (*psmtrack) << stream;
+         }
+         else 
+         {
+             tcSensorMapTrack *psmtrack;
+             if (maTrack.Lookup(nIdx, psmtrack) == false)
+             {
+                 fprintf(stderr, "tcAllianceSensorMap::operator<< -- "
+                                 "sensor map index corrupt\n");
+                 return stream;
+             }
+             (*psmtrack) << stream;
+         }
+ 
+     }
+ 
+     return stream;
+ }
+ 
+ /**
+ * Saves state to update stream
+ * Iterates through tracks, saving tracks that have been recently
+ * updated to stream.
+ */
+ tcUpdateStream& tcAllianceSensorMap::operator>>(tcUpdateStream& stream)
+ {
+     long pos = maTrack.GetStartPosition();
+     long nSize = maTrack.GetCount();
+     tcSensorMapTrack* sensorMapTrack;
+ 
+     for (long i=0; i<nSize; i++) 
+     {
+         long key;
+         maTrack.GetNextAssoc(pos, key, sensorMapTrack);
+         double dt = mfPreviousStatusTime - sensorMapTrack->mfTimestamp;
+         if (dt < 1.0)
+         {
+             stream << sensorMapTrack->mnID;
+             *sensorMapTrack >> stream;
+         }
+     }
+ 
+     return stream;
+ }
+ 
+ 
+ 
  bool tcAllianceSensorMap::AddReport(const Sensor::tcSensorReport& report) 
  {
***************
*** 427,447 ****
  {
      tnPoolIndex nIdx = maTrackToSensorTrack[anTrackID];
!     if (nIdx == NULL_INDEX) {
          tcSensorMapTrack *psmtrack = new tcSensorMapTrack();
          tnPoolIndex nKey;
          maTrack.AddElement(psmtrack, nKey);
          maTrackToSensorTrack[anTrackID] = nKey;
!         if (psmtrack->UpdateActiveReport(rpReport, anSensorID)) {
              //psmtrack->UpdateTrack();
              rpSMTrack = psmtrack;
              return true;
          }
!         else {
              throw "UpdateActiveReport error";
          }
      }
!     else {
          tcSensorMapTrack *psmtrack;
!         if (maTrack.Lookup(nIdx, psmtrack) == false) {
              throw "sensor map index corrupt";
          }
--- 537,562 ----
  {
      tnPoolIndex nIdx = maTrackToSensorTrack[anTrackID];
!     if (nIdx == NULL_INDEX) 
!     {
          tcSensorMapTrack *psmtrack = new tcSensorMapTrack();
          tnPoolIndex nKey;
          maTrack.AddElement(psmtrack, nKey);
          maTrackToSensorTrack[anTrackID] = nKey;
!         if (psmtrack->UpdateActiveReport(rpReport, anSensorID)) 
!         {
              //psmtrack->UpdateTrack();
              rpSMTrack = psmtrack;
              return true;
          }
!         else 
!         {
              throw "UpdateActiveReport error";
          }
      }
!     else 
!     {
          tcSensorMapTrack *psmtrack;
!         if (maTrack.Lookup(nIdx, psmtrack) == false) 
!         {
              throw "sensor map index corrupt";
          }
***************
*** 458,478 ****
  {
      tnPoolIndex nIdx = maTrackToSensorTrack[anTrackID];
!     if (nIdx == NULL_INDEX) {
          tcSensorMapTrack *psmtrack = new tcSensorMapTrack();
          tnPoolIndex nKey;
          maTrack.AddElement(psmtrack, nKey);
          maTrackToSensorTrack[anTrackID] = nKey;
!         if (psmtrack->UpdatePassiveReport(rpReport, anSensorID)) {
              //psmtrack->UpdateTrack();
              rpSMTrack = psmtrack;
              return true;
          }
!         else {
              throw "UpdatePassiveReport error";
          }
      }
!     else {
          tcSensorMapTrack *psmtrack;
!         if (maTrack.Lookup(nIdx, psmtrack) == false) {
              throw "sensor map index corrupt";
          }
--- 573,598 ----
  {
      tnPoolIndex nIdx = maTrackToSensorTrack[anTrackID];
!     if (nIdx == NULL_INDEX) 
!     {
          tcSensorMapTrack *psmtrack = new tcSensorMapTrack();
          tnPoolIndex nKey;
          maTrack.AddElement(psmtrack, nKey);
          maTrackToSensorTrack[anTrackID] = nKey;
!         if (psmtrack->UpdatePassiveReport(rpReport, anSensorID)) 
!         {
              //psmtrack->UpdateTrack();
              rpSMTrack = psmtrack;
              return true;
          }
!         else 
!         {
              throw "UpdatePassiveReport error";
          }
      }
!     else 
!     {
          tcSensorMapTrack *psmtrack;
!         if (maTrack.Lookup(nIdx, psmtrack) == false) 
!         {
              throw "sensor map index corrupt";
          }
***************
*** 484,492 ****
  
  
! int tcAllianceSensorMap::GetTrackCount(void) {
      return maTrack.GetCount();
  }
  
! tnPoolIndex tcAllianceSensorMap::GetStartTrackPosition(void) {
      return maTrack.GetStartPosition();
  }
--- 604,614 ----
  
  
! int tcAllianceSensorMap::GetTrackCount() 
! {
      return maTrack.GetCount();
  }
  
! tnPoolIndex tcAllianceSensorMap::GetStartTrackPosition() 
! {
      return maTrack.GetStartPosition();
  }
***************
*** 500,504 ****
  #define SENSORMAP_AGEOUTTIME 15.0f
  
! void tcAllianceSensorMap::DropTrack(tnPoolIndex anID) {
      if (anID == NULL_INDEX) {return;}
      tnPoolIndex nKey = maTrackToSensorTrack[anID];
--- 622,627 ----
  #define SENSORMAP_AGEOUTTIME 15.0f
  
! void tcAllianceSensorMap::DropTrack(tnPoolIndex anID)
! {
      if (anID == NULL_INDEX) {return;}
      tnPoolIndex nKey = maTrackToSensorTrack[anID];
***************
*** 580,584 ****
  
  /*******************************************************************************/
! tcSensorMapTrack* tcAllianceSensorMap::GetSensorMapTrack(unsigned long anTrackID) {
      unsigned long nMapID;
      tcSensorMapTrack *pSMTrack;
--- 703,708 ----
  
  /*******************************************************************************/
! tcSensorMapTrack* tcAllianceSensorMap::GetSensorMapTrack(unsigned long anTrackID) 
! {
      unsigned long nMapID;
      tcSensorMapTrack *pSMTrack;
***************
*** 663,674 ****
  /******************************** tcSensorMap **********************************/
  
! tcAllianceSensorMap* tcSensorMap::GetMap(UINT8 anAlliance) {
      int nMapIdx = maMapIdxForAlliance[anAlliance];
!     if (nMapIdx == -1) {
!         throw "Bad alliance passed to sensormap";
      }
      return mapMap[nMapIdx];
  }
! int tcSensorMap::GetTrackCount(UINT8 anAlliance) {
      tcAllianceSensorMap *pMap = GetMap(anAlliance);
      if (pMap == NULL) {return 0;}
--- 787,817 ----
  /******************************** tcSensorMap **********************************/
  
! tcAllianceSensorMap* tcSensorMap::GetMap(UINT8 anAlliance) 
! {
      int nMapIdx = maMapIdxForAlliance[anAlliance];
!     if (nMapIdx == -1) 
!     {
!         fprintf(stderr, "Bad alliance passed to sensormap (%d)\n", anAlliance);
!         return NULL;
      }
      return mapMap[nMapIdx];
  }
! 
! /**
! * Gets sensor map for alliance, creating if necessary
! * @return pointer to alliance sensor map
! */
! tcAllianceSensorMap* tcSensorMap::GetOrCreateMap(UINT8 alliance)
! {
!     int mapIdx = maMapIdxForAlliance[alliance];
!     if (mapIdx == -1) 
!     {
!         CreateMapForAlliance(alliance);
!     }
!     return GetMap(alliance);
! }
! 
! int tcSensorMap::GetTrackCount(UINT8 anAlliance) 
! {
      tcAllianceSensorMap *pMap = GetMap(anAlliance);
      if (pMap == NULL) {return 0;}

Index: Game.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/Game.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** Game.cpp	27 Apr 2004 01:24:25 -0000	1.76
--- Game.cpp	8 May 2004 21:25:26 -0000	1.77
***************
*** 121,126 ****
      goalTracker = simState->GetGoalTracker();
  
-     mcOptions.Init();
- 
      mbQuit = false;
      mbPaused = false;
--- 121,124 ----
***************
*** 413,417 ****
  
          /* ** Initialize mcMapData  * **/
!         mcMapData.AttachOptions(&mcOptions);
          mcMapData.LoadLowRes();
          mcMapData.LoadHighRes(-8.0f, 55.0f);
--- 411,415 ----
  
          /* ** Initialize mcMapData  * **/
!         mcMapData.AttachOptions(tcOptions::Get());
          mcMapData.LoadLowRes();
          mcMapData.LoadHighRes(-8.0f, 55.0f);
***************
*** 436,440 ****
          meScreenMode = START;
  
!         if (mcOptions.mbPlayMusic)
          {
              tcSound::Get()->PlayMusic("loop1");
--- 434,438 ----
          meScreenMode = START;
  
!         if (tcOptions::Get()->mbPlayMusic)
          {
              tcSound::Get()->PlayMusic("loop1");
***************
*** 479,483 ****
  void tcGame::InitializeSound()
  {
!     if (mcOptions.disableSound) return;
  
      if (tcSound::Get()->Init())
--- 477,481 ----
  void tcGame::InitializeSound()
  {
!     if (tcOptions::Get()->disableSound) return;
  
      if (tcSound::Get()->Init())
***************
*** 503,507 ****
      startView = new tcStartView(glCanvas, wxPoint(0,0), frameSize);
  
!     startView->AttachOptions(&mcOptions);
      startView->LoadBackgroundImage("start_background.jpg");
  
--- 501,505 ----
      startView = new tcStartView(glCanvas, wxPoint(0,0), frameSize);
  
!     startView->AttachOptions(tcOptions::Get());
      startView->LoadBackgroundImage("start_background.jpg");
  
***************
*** 524,528 ****
          "OptionsView", startView);
  
!     optionsView->AttachOptions(&mcOptions);
  
      if (optionsView->Init() == false)
--- 522,526 ----
          "OptionsView", startView);
  
!     optionsView->AttachOptions(tcOptions::Get());
  
      if (optionsView->Init() == false)
***************
*** 563,567 ****
      briefingConsoleLeft->SetWrap(48);
      briefingConsoleLeft->SetActive(false);
!     briefingConsoleLeft->SetSkipCount(mcOptions.renderSkipCount);
      briefingConsoleLeft->SetDelayedTextEffect(true);
      briefingConsoleLeft->LoadBackgroundImage("briefing_left.jpg");
--- 561,565 ----
      briefingConsoleLeft->SetWrap(48);
      briefingConsoleLeft->SetActive(false);
!     briefingConsoleLeft->SetSkipCount(tcOptions::Get()->renderSkipCount);
      briefingConsoleLeft->SetDelayedTextEffect(true);
      briefingConsoleLeft->LoadBackgroundImage("briefing_left.jpg");
***************
*** 583,587 ****
      briefingConsoleBottom->SetWrap(100);
      briefingConsoleBottom->SetActive(false);
!     briefingConsoleBottom->SetSkipCount(mcOptions.renderSkipCount);
      briefingConsoleBottom->LoadBackgroundImage("briefing_bottom.jpg");
      briefingConsoleBottom->Print(" "); // need this to get it to display
--- 581,585 ----
      briefingConsoleBottom->SetWrap(100);
      briefingConsoleBottom->SetActive(false);
!     briefingConsoleBottom->SetSkipCount(tcOptions::Get()->renderSkipCount);
      briefingConsoleBottom->LoadBackgroundImage("briefing_bottom.jpg");
      briefingConsoleBottom->Print(" "); // need this to get it to display
***************
*** 659,663 ****
  
      tacticalMap->AttachMapData(&mcMapData);
!     tacticalMap->AttachOptions(&mcOptions);
      tacticalMap->AttachCommandInterface(&mcCommandQueue);
  
--- 657,661 ----
  
      tacticalMap->AttachMapData(&mcMapData);
!     tacticalMap->AttachOptions(tcOptions::Get());
      tacticalMap->AttachCommandInterface(&mcCommandQueue);
  
***************
*** 689,693 ****
      infoConsole->SetWrap(28);
      infoConsole->SetActive(false);
!     infoConsole->SetSkipCount(mcOptions.renderSkipCount);
  
  
--- 687,691 ----
      infoConsole->SetWrap(28);
      infoConsole->SetActive(false);
!     infoConsole->SetSkipCount(tcOptions::Get()->renderSkipCount);
  
  
***************
*** 704,711 ****
      hookInfo->LoadBackgroundImage("console_b.jpg");
      hookInfo->AttachSimState(simState);
!     hookInfo->AttachOptions(&mcOptions);
      hookInfo->AttachUserInfo(&mcUserInfo);
      hookInfo->SetActive(false);
!     hookInfo->SetSkipCount(mcOptions.renderSkipCount);
  
      // objectControl init
--- 702,709 ----
      hookInfo->LoadBackgroundImage("console_b.jpg");
      hookInfo->AttachSimState(simState);
!     hookInfo->AttachOptions(tcOptions::Get());
      hookInfo->AttachUserInfo(&mcUserInfo);
      hookInfo->SetActive(false);
!     hookInfo->SetSkipCount(tcOptions::Get()->renderSkipCount);
  
      // objectControl init
***************
*** 723,729 ****
      objectControl->AttachCommandInterface(&mcCommandQueue);
      objectControl->AttachSimState(simState);
!     objectControl->AttachOptions(&mcOptions);
      objectControl->AttachUserInfo(&mcUserInfo);
!     objectControl->SetSkipCount(mcOptions.renderSkipCount);
  
      /* ** tcOOBView init  * **/
--- 721,727 ----
      objectControl->AttachCommandInterface(&mcCommandQueue);
      objectControl->AttachSimState(simState);
!     objectControl->AttachOptions(tcOptions::Get());
      objectControl->AttachUserInfo(&mcUserInfo);
!     objectControl->SetSkipCount(tcOptions::Get()->renderSkipCount);
  
      /* ** tcOOBView init  * **/
***************
*** 746,750 ****
      oobView->AttachSimState(simState);
      oobView->mnAlliance = mcUserInfo.GetOwnAlliance(); // TODO: make this configurable
!     oobView->SetSkipCount(mcOptions.renderSkipCount);
  
      // popupControl init
--- 744,748 ----
      oobView->AttachSimState(simState);
      oobView->mnAlliance = mcUserInfo.GetOwnAlliance(); // TODO: make this configurable
!     oobView->SetSkipCount(tcOptions::Get()->renderSkipCount);
  
      // popupControl init
***************
*** 864,868 ****
      mcGameView.AttachMapView(tacticalMap);
      mcGameView.AttachUserInfo(&mcUserInfo);
!     mcGameView.AttachOptions(&mcOptions);
      mcGameView.AttachObjectControl(objectControl);
  
--- 862,866 ----
      mcGameView.AttachMapView(tacticalMap);
      mcGameView.AttachUserInfo(&mcUserInfo);
!     mcGameView.AttachOptions(tcOptions::Get());
      mcGameView.AttachObjectControl(objectControl);
  
***************
*** 1280,1288 ****
      if (nLastCount == 0)
      {
-         if (mcOptions.debugLevel > 0)
- 		{
- 			wxMessageBox("UpdateFrame(game mode) init1\n");
- 		}
- 
          bResult = QueryPerformanceCounter(&nPerformanceCount);
  
--- 1278,1281 ----
***************
*** 1306,1314 ****
  
          snStartCount = nPerformanceCount;
- 
-         if (mcOptions.debugLevel > 0)
-         {
-             wxMessageBox("UpdateFrame(game mode) init2\n");
-         }
      }
  
--- 1299,1302 ----
***************
*** 1416,1420 ****
      
  
!     if(mcOptions.mbPlayMusic)
      {
          tcSound::Get()->UpdateAutoMusic(gameTime);
--- 1404,1408 ----
      
  
!     if (tcOptions::Get()->mbPlayMusic)
      {
          tcSound::Get()->UpdateAutoMusic(gameTime);
***************
*** 1438,1453 ****
          mpGraphicsEngine->RenderAll();
  
- 
-         if (mcOptions.debugLevel > 1)
-         {
-             wxMessageBox("pre Frame()\n");
-         }
- 
          viewer->Frame();
      }
! 	if (mcOptions.debugLevel > 1)
! 	{
! 		wxMessageBox("post Frame()\n");
! 	}
  
      snFrameCount++;
--- 1426,1432 ----
          mpGraphicsEngine->RenderAll();
  
          viewer->Frame();
      }
! 
  
      snFrameCount++;
***************
*** 1473,1482 ****
      tacticalMap->mfFrameRate = sfFrameRate;
  
-     if (mcOptions.debugLevel > 1)
-     {
-         mcOptions.debugLevel = 0;
-         mcOptions.Synchronize();
-     }
- 
      // update multiplayer interface at start and end of this method
      tcMultiplayerInterface::Get()->Update();
--- 1452,1455 ----
***************
*** 1545,1549 ****
      simState->GetPlatformAlliance(hookID, nAlliance);
  
! 	if ((mcUserInfo.IsOwnAlliance(nAlliance))||(mcOptions.mnCommandMode == 0))
          return MENUMODE_PLATFORM;
      else
--- 1518,1522 ----
      simState->GetPlatformAlliance(hookID, nAlliance);
  
!     if ((mcUserInfo.IsOwnAlliance(nAlliance))||(tcOptions::Get()->mnCommandMode == 0))
          return MENUMODE_PLATFORM;
      else