[Gcblue-commits] gcb_wx/src/sim Game.cpp,1.115,1.116

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

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

Modified Files:
	Game.cpp 
Log Message:
Added xml 3D model wrapper for better modularity
Improved animation support

Index: Game.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/Game.cpp,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** Game.cpp	10 Jan 2005 00:30:54 -0000	1.115
--- Game.cpp	16 Jan 2005 18:36:29 -0000	1.116
***************
*** 569,577 ****
  		meScreenMode = START;
  
- 		if (tcOptions::Get()->mbPlayMusic)
- 		{
- 			tcSound::Get()->PlayMusic("gcb_theme2");
- 		}
- 
  		wxWindow::Show(TRUE);
  	}
--- 569,572 ----
***************
*** 1317,1320 ****
--- 1312,1316 ----
  {
  	static teScreenMode lastMode = NONE;
+     static bool musicStarted = false;
  
  	tcTime::Get()->Update();
***************
*** 1432,1436 ****
  	viewer->Frame();
  
! 	tcSound::Get()->UpdateAutoMusic(0);
  
  #if 0
--- 1428,1438 ----
  	viewer->Frame();
  
!     if (!musicStarted && (tcOptions::Get()->mbPlayMusic))
!     {
!         tcSound::Get()->PlayMusic("gcb_theme2");
!         musicStarted = true;
!     }
! 
!     tcSound::Get()->UpdateAutoMusic(0);
  
  #if 0