[Scummvm-cvs-logs] CVS: scummvm script_v2.cpp,1.32,1.33 scumm.h,1.69,1.70

[James Brown]

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

Modified Files:
	script_v2.cpp scumm.h 
Log Message:
Rename o6_samGame to o6_bompWindow.



Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v2.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** script_v2.cpp	7 Mar 2002 04:29:24 -0000	1.32
--- script_v2.cpp	7 Mar 2002 05:41:53 -0000	1.33
***************
*** 152,156 ****
  	&Scumm::o6_drawBlastObject,
  	/* 64 */
! 	&Scumm::o6_samGame,
  	&Scumm::o6_stopObjectCode,
  	&Scumm::o6_stopObjectCode,
--- 152,156 ----
  	&Scumm::o6_drawBlastObject,
  	/* 64 */
! 	&Scumm::o6_bompWindow,
  	&Scumm::o6_stopObjectCode,
  	&Scumm::o6_stopObjectCode,
***************
*** 674,680 ****
  	_opcodes_lookup = opcode_lookup;
  }
! void Scumm::o6_samGame() {
  	int a, b, c, d;
! 	// Sam and Max game opcode
  	d = pop();
  	c = pop();
--- 674,680 ----
  	_opcodes_lookup = opcode_lookup;
  }
! void Scumm::o6_bompWindow() { // Set BOMP processing window
  	int a, b, c, d;
! 	
  	d = pop();
  	c = pop();
***************
*** 682,688 ****
  	a = pop();
  	
! 
  	// sub_274EF(a, b, c, d);
  }
  int Scumm::popRoomAndObj(int *room) {
  	int obj;
--- 682,689 ----
  	a = pop();
  	
! 	warning("o6_bompWindow(%d, %d, %d, %d)", a, b, c, d);	
  	// sub_274EF(a, b, c, d);
  }
+ 
  int Scumm::popRoomAndObj(int *room) {
  	int obj;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** scumm.h	7 Mar 2002 04:29:24 -0000	1.69
--- scumm.h	7 Mar 2002 05:41:53 -0000	1.70
***************
*** 1415,1419 ****
  	void o5_pickupObjectOld();
  	
! 	void o6_samGame();
  	void o6_pushByte();
  	void o6_pushWord();
--- 1415,1419 ----
  	void o5_pickupObjectOld();
  	
! 	void o6_bompWindow();
  	void o6_pushByte();
  	void o6_pushWord();