[Scummvm-cvs-logs] CVS: scummvm scumm.h,1.60,1.61 scummvm.cpp,1.55,1.56

[Vincent Hamm]

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

Modified Files:
	scumm.h scummvm.cpp 
Log Message:
Fixed OF_OWNER_ROOM for V7 implementation

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** scumm.h	5 Mar 2002 21:03:32 -0000	1.60
--- scumm.h	5 Mar 2002 21:27:23 -0000	1.61
***************
*** 323,331 ****
  	OF_STATE_MASK = 0xF0,
  	
- #if defined(FULL_THROTTLE)
- 	OF_OWNER_ROOM = 0xFF,
- #else
- 	OF_OWNER_ROOM = 0x0F,
- #endif
  	OF_STATE_SHL = 4
  };
--- 323,326 ----
***************
*** 803,806 ****
--- 798,803 ----
  	void *_gui; /* actually a pointer to a Gui */
  
+ 	byte OF_OWNER_ROOM;
+ 	
          int _gameTempo;
  	int _lastLoadedRoom;

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** scummvm.cpp	5 Mar 2002 20:13:47 -0000	1.55
--- scummvm.cpp	5 Mar 2002 21:27:24 -0000	1.56
***************
*** 219,222 ****
--- 219,228 ----
  		setupScummVarsOld();
  
+ 	if(_features & GF_AFTER_V7)
+ 		OF_OWNER_ROOM = 0xFF;
+ 	else
+ 		OF_OWNER_ROOM = 0x0F;
+ 
+ 	
  	if (_gameId==GID_INDY4 && _bootParam==0) {
  		_bootParam = -7873;