Fixed OF_OWNER_ROOM for V7 implementation

svn-id: r3654

2 files changed, 8 insertions, 5 deletions

diff --git a/scumm.h b/scumm.h
index 16ff38beb2..9c170b9186 100644
--- a/scumm.h
+++ b/scumm.h
@@ -322,11 +322,6 @@ enum {
 	OF_OWNER_MASK = 0x0F,
 	OF_STATE_MASK = 0xF0,
 	
-#if defined(FULL_THROTTLE)
-	OF_OWNER_ROOM = 0xFF,
-#else
-	OF_OWNER_ROOM = 0x0F,
-#endif
 	OF_STATE_SHL = 4
 };
 
@@ -802,6 +797,8 @@ struct Scumm {
 	ScummDebugger *_debugger;
 	void *_gui; /* actually a pointer to a Gui */
 
+	byte OF_OWNER_ROOM;
+	
         int _gameTempo;
 	int _lastLoadedRoom;
 	int _roomResource;
diff --git a/scummvm.cpp b/scummvm.cpp
index 4dabc1523d..0852dc7c57 100644
--- a/scummvm.cpp
+++ b/scummvm.cpp
@@ -218,6 +218,12 @@ void Scumm::scummMain(int argc, char **argv) {
 	else
 		setupScummVarsOld();
 
+	if(_features & GF_AFTER_V7)
+		OF_OWNER_ROOM = 0xFF;
+	else
+		OF_OWNER_ROOM = 0x0F;
+
+	
 	if (_gameId==GID_INDY4 && _bootParam==0) {
 		_bootParam = -7873;
 	}