[Scummvm-cvs-logs] CVS: scummvm object.cpp,1.36,1.37 script_v2.cpp,1.34,1.35

Vincent Hamm yazoo at users.sourceforge.net
Fri Mar 8 12:58:10 CET 2002


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

Modified Files:
	object.cpp script_v2.cpp 
Log Message:
Implemented multiple image blast object

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/object.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** object.cpp	8 Mar 2002 08:42:10 -0000	1.36
--- object.cpp	8 Mar 2002 20:57:09 -0000	1.37
***************
*** 1155,1160 ****
  	}
  
  	assert(ptr);
! 	ptr = findResource(MKID('IM01'), ptr);
  	assert(ptr);
  	bomp = findResourceData(MKID('BOMP'), ptr);
--- 1155,1163 ----
  	}
  
+ 	if(eo->l == 0)
+ 		eo->l = 1;
+ 	
  	assert(ptr);
! 	ptr = findResource(IMxx_tags[eo->l], ptr);
  	assert(ptr);
  	bomp = findResourceData(MKID('BOMP'), ptr);

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v2.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** script_v2.cpp	8 Mar 2002 08:42:11 -0000	1.34
--- script_v2.cpp	8 Mar 2002 20:57:09 -0000	1.35
***************
*** 2705,2709 ****
  		break;
  	case 211:
! 		warning("o6_kernelFunction: stub211(%d)", args[1]);
  		push(0);
  		break;
--- 2705,2709 ----
  		break;
  	case 211:
! 		warning("o6_kernelFunction: getInput(%d)", args[1]);
  		push(0);
  		break;





More information about the Scummvm-git-logs mailing list