[Scummvm-cvs-logs] CVS: scummvm script_v2.cpp,1.31,1.32 scumm.h,1.68,1.69 scummvm.dsp,1.20,1.21 string.cpp,1.27,1.28

[James Brown]

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

Modified Files:
	script_v2.cpp scumm.h scummvm.dsp string.cpp 
Log Message:
Fixes to Sam and Max subgames.
Add 'insane.cpp' to VC++ project.



Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v2.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** script_v2.cpp	6 Mar 2002 19:58:06 -0000	1.31
--- script_v2.cpp	7 Mar 2002 04:29:24 -0000	1.32
***************
*** 152,156 ****
  	&Scumm::o6_drawBlastObject,
  	/* 64 */
! 	&Scumm::o6_invalid,
  	&Scumm::o6_stopObjectCode,
  	&Scumm::o6_stopObjectCode,
--- 152,156 ----
  	&Scumm::o6_drawBlastObject,
  	/* 64 */
! 	&Scumm::o6_samGame,
  	&Scumm::o6_stopObjectCode,
  	&Scumm::o6_stopObjectCode,
***************
*** 674,678 ****
--- 674,688 ----
  	_opcodes_lookup = opcode_lookup;
  }
+ void Scumm::o6_samGame() {
+ 	int a, b, c, d;
+ 	// Sam and Max game opcode
+ 	d = pop();
+ 	c = pop();
+ 	b = pop();
+ 	a = pop();
+ 	
  
+ 	// sub_274EF(a, b, c, d);
+ }
  int Scumm::popRoomAndObj(int *room) {
  	int obj;
***************
*** 2570,2577 ****
  			break;
  
- 		case 124: /* samnmax */
- 			warning("o6_miscOps: _saveSound=%d", args[1]);
- 			break;
- 
  		case 104: /* samnmax */
  			nukeFlObjects(args[2], args[3]);
--- 2580,2583 ----
***************
*** 2644,2648 ****
  
  		case 123:
! 			error("stub o6_miscOps_123(%d,%d)", args[1], args[2]);
  			break;
  
--- 2650,2659 ----
  
  		case 123:
! 			swapPalColors(args[1],args[2]);			
! 			break;
! 
! 		case 124: /* samnmax */
! 			warning("o6_miscOps: _saveSound=%d", args[1]);
! 			_saveSound = args[1];
  			break;
  
***************
*** 2659,2664 ****
  
  	getStackList(args,sizeof(args)/sizeof(args[0]));
! 
  	switch(args[0]) {
  	case 115:
  		warning("o6_kernelFunction: stub115(%d,%d)", args[1], args[2]);
--- 2670,2680 ----
  
  	getStackList(args,sizeof(args)/sizeof(args[0]));
! 	
  	switch(args[0]) {
+ 	case 113:
+ 		// Do something to [1] x [2] (x/y)
+ 		warning("o6_kernelFunction: stub113(%d,%d)", args[1], args[2]);
+ 		push(0);
+ 		break;
  	case 115:
  		warning("o6_kernelFunction: stub115(%d,%d)", args[1], args[2]);

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** scumm.h	6 Mar 2002 23:17:16 -0000	1.68
--- scumm.h	7 Mar 2002 04:29:24 -0000	1.69
***************
*** 858,862 ****
  	byte OF_OWNER_ROOM;
  	
!         int _gameTempo;
  	int _lastLoadedRoom;
  	int _roomResource;
--- 858,862 ----
  	byte OF_OWNER_ROOM;
  	
!         int _gameTempo, _saveSound;
  	int _lastLoadedRoom;
  	int _roomResource;
***************
*** 1415,1418 ****
--- 1415,1419 ----
  	void o5_pickupObjectOld();
  	
+ 	void o6_samGame();
  	void o6_pushByte();
  	void o6_pushWord();

Index: scummvm.dsp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.dsp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** scummvm.dsp	6 Mar 2002 12:24:56 -0000	1.20
--- scummvm.dsp	7 Mar 2002 04:29:24 -0000	1.21
***************
*** 43,47 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c
! # ADD CPP /nologo /G6 /Zp8 /MD /W3 /GX- /O2 /Ob2 /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  # SUBTRACT CPP /YX /Yc /Yu
  # ADD BASE RSC /l 0x41d /d "NDEBUG"
--- 43,47 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c
! # ADD CPP /nologo /G6 /MD /W3 /O2 /Ob2 /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  # SUBTRACT CPP /YX /Yc /Yu
  # ADD BASE RSC /l 0x41d /d "NDEBUG"
***************
*** 171,174 ****
--- 171,178 ----
  
  SOURCE=.\gui.cpp
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=.\insane.cpp
  # End Source File
  # Begin Source File

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/string.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** string.cpp	6 Mar 2002 12:24:56 -0000	1.27
--- string.cpp	7 Mar 2002 04:29:24 -0000	1.28
***************
*** 166,173 ****
  		a = buffer[2] | (buffer[3]<<8) | (buffer[6]<<16) | (buffer[7]<<24);
  		b = buffer[10] | (buffer[11]<<8) | (buffer[14]<<16) | (buffer[15]<<24);
! 		talkSound(a,b,1);
  	}
  
! //	warning("unkMessage1(\"%s\")", buf);
  }
  
--- 166,174 ----
  		a = buffer[2] | (buffer[3]<<8) | (buffer[6]<<16) | (buffer[7]<<24);
  		b = buffer[10] | (buffer[11]<<8) | (buffer[14]<<16) | (buffer[15]<<24);
! 		if (_saveSound != 1)
! 			talkSound(a,b,1);
  	}
  
! 	warning("unkMessage1(\"%s\")", buffer);
  }