[Scummvm-cvs-logs] CVS: scummvm actor.cpp,1.53,1.54 scummvm.cpp,1.120,1.121

Vincent Hamm yazoo at users.sourceforge.net
Sun Apr 21 10:56:02 CEST 2002


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

Modified Files:
	actor.cpp scummvm.cpp 
Log Message:
Fix (hack) imuse for samnmax. Fix (hack) samnmax inventory screen

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/actor.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** actor.cpp	21 Apr 2002 09:20:38 -0000	1.53
--- actor.cpp	21 Apr 2002 17:54:59 -0000	1.54
***************
*** 918,922 ****
  			a->mask = 0;
  		else if (g_scumm->getClass(a->number, 21))
! 			a->forceClip = 1;
  
  		a->needRedraw = false;
--- 918,925 ----
  			a->mask = 0;
  		else if (g_scumm->getClass(a->number, 21))
! 			a->forceClip = 1;
! 		
! 		if (_gameId==GID_SAMNMAX && getState(995)) // FIXME: ugly fix for samnmax inventory
! 			return;
  
  		a->needRedraw = false;

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -d -r1.120 -r1.121
*** scummvm.cpp	20 Apr 2002 04:09:02 -0000	1.120
--- scummvm.cpp	21 Apr 2002 17:54:59 -0000	1.121
***************
*** 308,312 ****
  	runAllScripts();
  	checkExecVerbs();
! 	checkAndRunVar33();
  
  	if (_currentRoom == 0) {
--- 308,312 ----
  	runAllScripts();
  	checkExecVerbs();
! 	checkAndRunVar33();
  
  	if (_currentRoom == 0) {





More information about the Scummvm-git-logs mailing list