[Scummvm-cvs-logs] CVS: scummvm scummvm.cpp,1.94,1.95 sdl.cpp,1.51,1.52

[Vincent Hamm]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv25675

Modified Files:
	scummvm.cpp sdl.cpp 
Log Message:
Fixed gui loop

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** scummvm.cpp	23 Mar 2002 22:03:35 -0000	1.94
--- scummvm.cpp	24 Mar 2002 00:44:28 -0000	1.95
***************
*** 1073,1077 ****
  	setupSound();
  
! 	runScript(1,0,0,&_bootParam);
  	
  //	_scummTimer = 0;
--- 1073,1077 ----
  	setupSound();
  
! //	runScript(1,0,0,&_bootParam);
  	
  //	_scummTimer = 0;

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** sdl.cpp	23 Mar 2002 22:03:35 -0000	1.51
--- sdl.cpp	24 Mar 2002 00:44:28 -0000	1.52
***************
*** 953,956 ****
--- 953,960 ----
  
  	scumm->launch();
+ 
+ 	_system.last_time = SDL_GetTicks();
+ 
+ 	scumm->runScript(1,0,0,&scumm->_bootParam);
  	
  //	scumm->scummMain(argc, argv); // Todo: need to change that as well
***************
*** 958,962 ****
  	gui.init(scumm);	/* Reinit GUI after loading a game */
  
- 	_system.last_time = SDL_GetTicks();
  	
  	scumm->mainRun();
--- 962,965 ----
***************
*** 1984,1995 ****
  int OSystem::waitTick(int delta)
  {
! 	updateScreen(scumm);
! 	new_time = SDL_GetTicks();
! 	waitForTimer(scumm, delta * 15 + last_time - new_time);
! 	last_time = SDL_GetTicks();
! 	if (gui._active) { 
! 		gui.loop();
! 		delta = 5;
! 	}
  
  	return(delta);
--- 1987,2001 ----
  int OSystem::waitTick(int delta)
  {
! 	do
! 	{
! 		updateScreen(scumm);
! 		new_time = SDL_GetTicks();
! 		waitForTimer(scumm, delta * 15 + last_time - new_time);
! 		last_time = SDL_GetTicks();
! 		if (gui._active) { 
! 			gui.loop();
! 			delta = 5;
! 		}
! 	}while(gui._active);
  
  	return(delta);