[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.149,1.150 debugger.cpp,1.74,1.75 gfx.cpp,2.182,2.183 script_v5.cpp,1.145,1.146 scumm.h,1.281,1.282 scummvm.cpp,2.319,2.320

[Jonathan Gray]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv5275

Modified Files:
	actor.cpp debugger.cpp gfx.cpp script_v5.cpp scumm.h 
	scummvm.cpp 
Log Message:
remove GF_LOOM

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- actor.cpp	6 Aug 2003 09:30:47 -0000	1.149
+++ actor.cpp	8 Aug 2003 11:32:40 -0000	1.150
@@ -225,7 +225,7 @@
 	// not necessary here because we never call the function unless the
 	// actor is in the current room anyway.
 	
-	if (!ignoreBoxes || (_vm->_features & GF_LOOM)) {
+	if (!ignoreBoxes || (_vm->_gameId == GID_LOOM || _vm->_gameId == GID_LOOM256)) {
 		specdir = _vm->_extraBoxFlags[walkbox];
 		if (specdir) {
 			if (specdir & 0x8000) {

Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debugger.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- debugger.cpp	6 Aug 2003 17:51:39 -0000	1.74
+++ debugger.cpp	8 Aug 2003 11:32:40 -0000	1.75
@@ -99,7 +99,7 @@
 		DCmd_Register("scripts", &ScummDebugger::Cmd_PrintScript);
 		DCmd_Register("importres", &ScummDebugger::Cmd_ImportRes);
 
-		if (_s->_features & GF_LOOM)
+		if (_s->_gameId == GID_LOOM || _s->_gameId == GID_LOOM256)
 			DCmd_Register("drafts", &ScummDebugger::Cmd_PrintDraft);
 
 		DCmd_Register("loadgame", &ScummDebugger::Cmd_LoadGame);
@@ -934,7 +934,7 @@
 	const char *notes = "cdefgabC";
 	int i, base, draft;
 
-	if (!(_s->_features & GF_LOOM)) {
+	if (_s->_gameId != GID_LOOM && _s->_gameId != GID_LOOM256) {
 		Debug_Printf("Command only works with Loom/LoomCD\n");
 		return true;
 	}

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.182
retrieving revision 2.183
diff -u -d -r2.182 -r2.183
--- gfx.cpp	6 Aug 2003 09:30:48 -0000	2.182
+++ gfx.cpp	8 Aug 2003 11:32:40 -0000	2.183
@@ -664,7 +664,7 @@
 	_flashlight.x = x - _flashlight.w / 2 - _screenStartStrip * 8;
 	_flashlight.y = y - _flashlight.h / 2;
 
-	if (_features & GF_LOOM)
+	if (_gameId == GID_LOOM || _gameId == GID_LOOM256)
 		_flashlight.y -= 12;
 
 	// Clip the flashlight at the borders
@@ -3508,7 +3508,7 @@
 
 	// FIXME: None of the stock cursors are right for Loom. Why is that?
 
-	if (_features & GF_LOOM) {
+	if (_gameId == GID_LOOM || _gameId == GID_LOOM256) {
 		int w = 0;
 
 		_cursor.width = 8;

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- script_v5.cpp	6 Aug 2003 12:04:27 -0000	1.145
+++ script_v5.cpp	8 Aug 2003 11:32:40 -0000	1.146
@@ -647,7 +647,7 @@
 		// omit for now.
 		// FIXME: Actually: is this opcode ever called by a non-Loom game?
 		// Which V3-V5 game besides Loom makes use of custom cursors, ever?
-		if (!(_features & GF_LOOM)) {
+		if (_gameId != GID_LOOM && _gameId != GID_LOOM256) {
 			warning("setCursorImg called - tell Fingolfin where you saw this!");
 			setCursorImg(i, j, 1);
 		}

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -d -r1.281 -r1.282
--- scumm.h	6 Aug 2003 12:04:27 -0000	1.281
+++ scumm.h	8 Aug 2003 11:32:40 -0000	1.282
@@ -85,7 +85,6 @@
 	GF_AFTER_HEV7          = 1 << 15,
 	GF_FMTOWNS             = 1 << 16,
 	GF_FEW_LOCALS          = 1 << 17,
-	GF_LOOM                = 1 << 18,	// FIXME: remove this
 
 	GF_EXTERNAL_CHARSET    = GF_SMALL_HEADER
 };

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.319
retrieving revision 2.320
diff -u -d -r2.319 -r2.320
--- scummvm.cpp	6 Aug 2003 12:04:27 -0000	2.319
+++ scummvm.cpp	8 Aug 2003 11:32:40 -0000	2.320
@@ -82,7 +82,7 @@
 	{"zak256", "Zak McKracken and the Alien Mindbenders (256)", GID_ZAK256, 3, VersionSettings::ADLIB_ALWAYS,
 	 GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALING | GF_OLD256 | GF_FMTOWNS | GF_AUDIOTRACKS, "00.LFL"},
 	{"loom", "Loom", GID_LOOM, 3, VersionSettings::ADLIB_ALWAYS,
-	 GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALING | GF_USE_KEY | GF_16COLOR | GF_OLD_BUNDLE | GF_LOOM, "00.LFL"},
+	 GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALING | GF_USE_KEY | GF_16COLOR | GF_OLD_BUNDLE, "00.LFL"},
 
 	/* Scumm Version 4 */
 	{"monkeyEGA", "Monkey Island 1 (EGA)", GID_MONKEY_EGA, 4, VersionSettings::ADLIB_ALWAYS,
@@ -94,7 +94,7 @@
 	{"monkeyVGA", "Monkey Island 1 (256 color Floppy version)", GID_MONKEY_VGA,  4, VersionSettings::ADLIB_ALWAYS,
 	 GF_SMALL_HEADER | GF_USE_KEY, "000.LFL"},
 	{"loomcd", "Loom (256 color CD version)", GID_LOOM256, 4, VersionSettings::ADLIB_ALWAYS,
-	 GF_SMALL_HEADER | GF_USE_KEY | GF_LOOM | GF_AUDIOTRACKS, "000.LFL"},
+	 GF_SMALL_HEADER | GF_USE_KEY | GF_AUDIOTRACKS, "000.LFL"},
 	{"monkey", "Monkey Island 1", GID_MONKEY, 5, VersionSettings::ADLIB_PREFERRED,
 	 GF_USE_KEY | GF_AUDIOTRACKS, 0},
 	{"monkey1", "Monkey Island 1 (alt)", GID_MONKEY, 5, VersionSettings::ADLIB_PREFERRED,