[Gcblue-commits] gcb_wx/src/sim Game.cpp,1.96,1.97

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

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

Modified Files:
	Game.cpp 
Log Message:


Index: Game.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/Game.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -d -r1.96 -r1.97
*** Game.cpp	14 Sep 2004 23:17:16 -0000	1.96
--- Game.cpp	16 Sep 2004 02:24:50 -0000	1.97
***************
*** 500,508 ****
  		share its 2D surface with the other windows */
  		InitializeStartView(); 
! 		InitializeOptionsView();
  		InitializeCreditView();
! 		InitializeNetworkView();
! 		InitializeScenarioSelectView();
! 		InitializeDisplaySettingsView();
  
  		tcMultiplayerInterface::Get()->SetEvtHandler(this);
--- 500,508 ----
  		share its 2D surface with the other windows */
  		InitializeStartView(); 
! 		//InitializeOptionsView();
  		InitializeCreditView();
! 		//InitializeNetworkView();
! 		//InitializeScenarioSelectView();
! 		//InitializeDisplaySettingsView();
  
  		tcMultiplayerInterface::Get()->SetEvtHandler(this);
***************
*** 623,627 ****
  	smallViewerSize = wxSize(380, 200);
  
! 	startViewerSize = wxSize(mnWidth/2, mnWidth/4);
  	startViewerPosition = wxPoint(mnWidth - startViewerSize.x, 
  		                          mnHeight - startViewerSize.y);
--- 623,627 ----
  	smallViewerSize = wxSize(380, 200);
  
! 	startViewerSize = wxSize(mnWidth, mnHeight);
  	startViewerPosition = wxPoint(mnWidth - startViewerSize.x, 
  		                          mnHeight - startViewerSize.y);
***************
*** 666,672 ****
  void tcGame::InitializeStartView()
  {
! 	wxASSERT(glCanvas);
! 
! 	startView = new tcStartView(glCanvas, wxPoint(0,0), frameSize);
  
  	startView->AttachOptions(tcOptions::Get());
--- 666,671 ----
  void tcGame::InitializeStartView()
  {
! 	wxSize viewerSize = viewer->GetSize();
! 	startView = new tcStartView(viewer, wxPoint(0,0), viewerSize, "StartView");
  
  	startView->AttachOptions(tcOptions::Get());
***************
*** 687,690 ****
--- 686,690 ----
  void tcGame::InitializeOptionsView()
  {
+ #if 0
  	wxASSERT(startView);
  
***************
*** 699,702 ****
--- 699,703 ----
  
  	optionsView->SetActive(false);
+ #endif
  }
  
***************
*** 707,711 ****
  void tcGame::InitializeNetworkView()
  {
! 	networkView = new tcNetworkView(glCanvas, startView, wxPoint(0,0), frameSize);
  }
  
--- 708,712 ----
  void tcGame::InitializeNetworkView()
  {
! 	//networkView = new tcNetworkView(glCanvas, startView, wxPoint(0,0), frameSize);
  }
  
***************
*** 759,765 ****
  void tcGame::InitializeCreditView()
  {
! 	wxASSERT(startView);
! 	creditView = new tcCreditView(glCanvas, wxPoint(0,0), frameSize,
! 		"CreditView", startView);
  
  	creditView->LoadBackgroundImage("start_background.jpg");
--- 760,766 ----
  void tcGame::InitializeCreditView()
  {
! 	wxSize viewerSize = viewer->GetSize();
! 	creditView = new tcCreditView(viewer, wxPoint(0,0), viewerSize,
! 		"CreditView");
  
  	creditView->LoadBackgroundImage("start_background.jpg");
***************
*** 795,802 ****
  void tcGame::InitializeDisplaySettingsView()
  {
! 	wxASSERT(startView);
  
! 	displaySettingsView = 
! 		new tcDisplaySettingsView(glCanvas, startView, wxPoint(0,0), frameSize);
  }
  
--- 796,803 ----
  void tcGame::InitializeDisplaySettingsView()
  {
! //	wxASSERT(startView);
  
! //	displaySettingsView = 
! //		new tcDisplaySettingsView(glCanvas, startView, wxPoint(0,0), frameSize);
  }
  
***************
*** 807,810 ****
--- 808,812 ----
  void tcGame::InitializeScenarioSelectView()
  {
+ #if 0
  	wxASSERT(startView);
  
***************
*** 818,821 ****
--- 820,824 ----
  
  	scenarioSelectView->SetActive(false);
+ #endif
  }
  
***************
*** 1314,1322 ****
  	if (meScreenMode != lastMode)
  	{
! 		optionsView->SetActive(false);
  		startView->SetActive(false);
  		creditView->SetActive(false);
! 		scenarioSelectView->SetActive(false);
! 		networkView->SetActive(false);
  		chatBox->SetActive(false);
  	}
--- 1317,1325 ----
  	if (meScreenMode != lastMode)
  	{
! 		//optionsView->SetActive(false);
  		startView->SetActive(false);
  		creditView->SetActive(false);
! 		//scenarioSelectView->SetActive(false);
! 		//networkView->SetActive(false);
  		chatBox->SetActive(false);
  	}
***************
*** 1408,1412 ****
  
  	viewer->Update(gameDateZulu);
! 	mpGraphicsEngine->RenderAll();
  	viewer->Frame();
  
--- 1411,1415 ----
  
  	viewer->Update(gameDateZulu);
! 	//mpGraphicsEngine->RenderAll();
  	viewer->Frame();