[Gcblue-commits] gcb_wx/src/sim Game.cpp,1.81,1.82 gcb.cpp,1.14,1.15

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

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

Modified Files:
	Game.cpp gcb.cpp 
Log Message:


Index: Game.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/Game.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** Game.cpp	29 May 2004 00:11:54 -0000	1.81
--- Game.cpp	14 Jun 2004 21:52:48 -0000	1.82
***************
*** 48,51 ****
--- 48,52 ----
  #include "tcStandardWindow.h"
  #include "tcNetworkView.h"
+ #include "tcDisplaySettingsView.h"
  #include "network/tcMultiplayerInterface.h"
  #include "tcChatBox.h"
***************
*** 75,78 ****
--- 76,80 ----
  	EVT_COMMAND(ID_STARTVIEW, wxEVT_COMMAND_BUTTON_CLICKED , tcGame::SwitchToStart)
  	EVT_COMMAND(ID_CREDITVIEW, wxEVT_COMMAND_BUTTON_CLICKED , tcGame::SwitchToCredit)
+ 	EVT_COMMAND(ID_DISPLAYSETTINGS, wxEVT_COMMAND_BUTTON_CLICKED , tcGame::SwitchToDisplaySettings)
  	EVT_COMMAND(ID_OPTIONSVIEW, wxEVT_COMMAND_BUTTON_CLICKED , tcGame::SwitchToOptions)
  	EVT_COMMAND(ID_SCENARIOSELECTVIEW, wxEVT_COMMAND_BUTTON_CLICKED , tcGame::SwitchToScenarioSelect)
***************
*** 299,302 ****
--- 301,309 ----
  }
  
+ void tcGame::SwitchToDisplaySettings(wxCommandEvent& event)
+ {
+     meScreenMode = DISPLAYSETTINGS;
+ }
+ 
  void tcGame::SwitchToOptions(wxCommandEvent& event)
  {
***************
*** 402,405 ****
--- 409,413 ----
          InitializeNetworkView();
          InitializeScenarioSelectView();
+ 		InitializeDisplaySettingsView();
          
          tcMultiplayerInterface::Get()->SetEvtHandler(this);
***************
*** 640,643 ****
--- 648,663 ----
  
  /**
+  * Initializes the Display Settings GUI
+  *
+  */
+ void tcGame::InitializeDisplaySettingsView()
+ {
+     wxASSERT(startView);
+ 
+     displaySettingsView = 
+ 		new tcDisplaySettingsView(glCanvas, startView, wxPoint(0,0), frameSize);
+ }
+ 
+ /**
   * Initializes the Select Scenario View screen.
   *
***************
*** 1133,1136 ****
--- 1153,1160 ----
            optionsView->Draw();
            break;
+ 	  case DISPLAYSETTINGS:
+ 		  displaySettingsView->SetActive(true);
+ 		  displaySettingsView->Draw();
+ 		  break;
        case SCENARIOSELECT:
            scenarioSelectView->SetActive(true);
***************
*** 1194,1197 ****
--- 1218,1222 ----
          optionsView->SetActive(false);
          networkView->SetActive(false);
+ 		displaySettingsView->SetActive(false);
          tacticalMap->SetActive(drawTacticalMap);
          infoConsole->SetActive(drawEdgeWindows);
***************
*** 1225,1228 ****
--- 1250,1254 ----
          optionsView->SetActive(false);
          networkView->SetActive(false);
+ 		displaySettingsView->SetActive(false);
          tacticalMap->SetActive(drawTacticalMap);
          infoConsole->SetActive(false);
***************
*** 1251,1254 ****
--- 1277,1281 ----
          optionsView->SetActive(true);
          //networkView->SetActive(false);
+ 		//displaySettingsView->SetActive(false);
          tacticalMap->SetActive(false);
          infoConsole->SetActive(false);
***************
*** 1266,1269 ****
--- 1293,1297 ----
          //optionsView->SetActive(false);
          networkView->SetActive(true);
+ 		// displaySettingsView->SetActive(false);
          tacticalMap->SetActive(false);
          infoConsole->SetActive(false);
***************
*** 1275,1278 ****
--- 1303,1323 ----
          networkView->Draw();
      }
+ 	else if (meScreenMode == DISPLAYSETTINGS)
+ 	{
+         briefingConsoleLeft->SetActive(false);
+         briefingConsoleBottom->SetActive(false);
+         //optionsView->SetActive(false);
+         //networkView->SetActive(false);
+ 		displaySettingsView->SetActive(true);
+         tacticalMap->SetActive(false);
+         infoConsole->SetActive(false);
+         hookInfo->SetActive(false);
+         oobView->SetActive(false);
+         objectControl->SetActive(false);
+         viewer->SetActive(false);
+         chatBox->SetActive(false);
+ 
+         displaySettingsView->Draw();
+ 	}
  }
  

Index: gcb.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/gcb.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** gcb.cpp	6 Mar 2004 20:52:29 -0000	1.14
--- gcb.cpp	14 Jun 2004 21:52:55 -0000	1.15
***************
*** 33,36 ****
--- 33,37 ----
  #include "gcb.h"
  #include "Game.h"
+ #include "tcDisplayModes.h"
  
  using namespace Gdiplus;
***************
*** 278,281 ****
--- 279,283 ----
      try
      {
+ 		tcDisplayModes::Get()->LoadModeFromOptions();
          gameFrame = new tcGame(wxPoint(0,0), wxGetDisplaySize()); // full screen
          gameFrame->Init();