[Scummvm-cvs-logs] CVS: scummvm Makefile,1.31,1.32 insane.cpp,1.12,1.13 sdl.cpp,1.68,1.69 smush.h,1.1,1.2 system.h,1.1,1.2

[Vincent Hamm]

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

Modified Files:
	Makefile insane.cpp sdl.cpp smush.h system.h 
Log Message:
Fixed most of the speed issues of insane

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** Makefile	25 Mar 2002 17:45:55 -0000	1.31
--- Makefile	25 Mar 2002 22:46:32 -0000	1.32
***************
*** 16,20 ****
  	sys.o verbs.o sdl.o script_v1.o script_v2.o debug.o gui.o \
  	sound/imuse.o sound/fmopl.o sound/adlib.o sound/gmidi.o debugrl.o \
! 	akos.o vars.o insane.o gameDetector.o init.o v3/resource_v3.o v4/resource_v4.o
  
  DISTFILES=$(OBJS:.o=.cpp) Makefile scumm.h scummsys.h stdafx.h stdafx.cpp \
--- 16,21 ----
  	sys.o verbs.o sdl.o script_v1.o script_v2.o debug.o gui.o \
  	sound/imuse.o sound/fmopl.o sound/adlib.o sound/gmidi.o debugrl.o \
! 	akos.o vars.o insane.o gameDetector.o init.o \
! 	v3/resource_v3.o v4/resource_v4.o
  
  DISTFILES=$(OBJS:.o=.cpp) Makefile scumm.h scummsys.h stdafx.h stdafx.cpp \

Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/insane.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** insane.cpp	25 Mar 2002 17:45:55 -0000	1.12
--- insane.cpp	25 Mar 2002 22:46:32 -0000	1.13
***************
*** 34,37 ****
--- 34,39 ----
  }
  
+ int _frameChanged;
+ 
  uint32 SmushPlayer::nextBE32() {
  	uint32 a = *((uint32*)_cur);
***************
*** 355,359 ****
  
  
! void codec37(CodecData *cd, PersistentCodecData37 *pcd) {
  	int width_in_blocks, height_in_blocks;
  	int src_pitch;
--- 357,361 ----
  
  
! int codec37(CodecData *cd, PersistentCodecData37 *pcd) {
  	int width_in_blocks, height_in_blocks;
  	int src_pitch;
***************
*** 362,365 ****
--- 364,369 ----
  	bool result = false;
  
+ 	_frameChanged=1;
+ 	
  	width_in_blocks = (cd->w + 3) >> 2;
  	height_in_blocks = (cd->h + 3) >> 2;
***************
*** 384,388 ****
  			codec37_bompdepack(curbuf, cd->src+16, size);
  		else
! 			return;
  
  		memset(pcd->deltaBuf, 0, curbuf - pcd->deltaBuf);
--- 388,392 ----
  			codec37_bompdepack(curbuf, cd->src+16, size);
  		else
! 			return(1);
  
  		memset(pcd->deltaBuf, 0, curbuf - pcd->deltaBuf);
***************
*** 398,401 ****
--- 402,406 ----
  
  		if (number&1 && cd->src[12]&1 && cd->flags&0x10) {
+ 			_frameChanged = 0;
  			result=true;
  			break;
***************
*** 416,420 ****
  	case 4:
  		warning("code %d", cd->src[0]);
! 		return;
  
  	default:
--- 421,425 ----
  	case 4:
  		warning("code %d", cd->src[0]);
! 		return(1);
  
  	default:
***************
*** 429,432 ****
--- 434,439 ----
  		memcpy(cd->out, pcd->deltaBufs[pcd->curtable], 320*200);
  	}
+ 
+ 	return(_frameChanged);
  }
  
***************
*** 462,466 ****
  		break;
  	case 37:
! 		codec37(&cd, &pcd37);
  		break;
  	default:
--- 469,473 ----
  		break;
  	case 37:
! 		_frameChanged = codec37(&cd, &pcd37);
  		break;
  	default:
***************
*** 600,604 ****
--- 607,615 ----
  	sm->_insaneState = 1;
  
+ 	sm->delta = 5;
+ 
  	do {
+ 		_frameChanged = 1;
+ 		
  		if(ftell(_in)>=fileSize )
  			return;
***************
*** 616,623 ****
  		}
  
! 		blitToScreen(sm,sm->_videoBuffer, 0, 0, 320 ,200);
! 		updateScreen(sm);
  
! 		sm->delta = sm->_system->waitTick(sm->delta);
  	
  		sm->processKbd();
--- 627,637 ----
  		}
  
! 		if ( _frameChanged)
! 		{
! 			blitToScreen(sm,sm->_videoBuffer, 0, 0, 320 ,200);
! 			updateScreen(sm);
  
! 			sm->delta = sm->_system->waitTick(sm->delta);
! 		}
  	
  		sm->processKbd();
***************
*** 626,629 ****
--- 640,647 ----
  
  	sm->_insaneState = 0;
+ 
+ //	if (sm->_lastKeyHit==sm->_vars[sm->VAR_CUTSCENEEXIT_KEY])
+ 		sm->exitCutscene();
+ 											
  }
  

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** sdl.cpp	25 Mar 2002 18:17:40 -0000	1.68
--- sdl.cpp	25 Mar 2002 22:46:32 -0000	1.69
***************
*** 954,957 ****
--- 954,958 ----
  	scumm->_soundCardType = detector._soundCardType;
  
+ 	scumm->delta=6;
  	
  	scumm->_gui = &gui;
***************
*** 962,970 ****
  	scumm->_system = &_system;
  
! 	_system.last_time = SDL_GetTicks();
! 	
! 	scumm->launch();
  
! 	_system.last_time = SDL_GetTicks();
  
  //	scumm->runScript(1,0,0,&scumm->_bootParam);
--- 963,969 ----
  	scumm->_system = &_system;
  
! 	_system.last_time=0;
  
! 	scumm->launch();
  
  //	scumm->runScript(1,0,0,&scumm->_bootParam);
***************
*** 2010,2012 ****
--- 2009,2015 ----
  
  	return(delta);
+ }
+ 
+ OSystem::OSystem(){
+ 	last_time = SDL_GetTicks();
  }

Index: smush.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/smush.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** smush.h	6 Mar 2002 19:58:06 -0000	1.1
--- smush.h	25 Mar 2002 22:46:32 -0000	1.2
***************
*** 75,77 ****
--- 75,79 ----
  	Scumm *sm;
  
+ 	int _frameChanged;
+ 
  };

Index: system.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/system.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** system.h	21 Mar 2002 01:03:27 -0000	1.1
--- system.h	25 Mar 2002 22:46:32 -0000	1.2
***************
*** 5,7 ****
--- 5,9 ----
  		int last_time;
  		int new_time;
+ 
+ 		OSystem();
  };