[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.148,1.149 debugger.cpp,1.71,1.72 gfx.cpp,2.181,2.182 script_v5.cpp,1.143,1.144 scumm.h,1.279,1.280 scummvm.cpp,2.317,2.318

[Travis Howell]

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

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

Add GF_LOOM feature flag for loom games to reduce checks.
Will make it easier to add loom fm towns target in future.


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- actor.cpp	27 Jul 2003 23:45:43 -0000	1.148
+++ actor.cpp	6 Aug 2003 09:30:47 -0000	1.149
@@ -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->_gameId == GID_LOOM || _vm->_gameId == GID_LOOM256) {
+	if (!ignoreBoxes || (_vm->_features & GF_LOOM)) {
 		specdir = _vm->_extraBoxFlags[walkbox];
 		if (specdir) {
 			if (specdir & 0x8000) {

Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debugger.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- debugger.cpp	5 Aug 2003 19:43:04 -0000	1.71
+++ debugger.cpp	6 Aug 2003 09:30:48 -0000	1.72
@@ -99,7 +99,7 @@
 		DCmd_Register("scripts", &ScummDebugger::Cmd_PrintScript);
 		DCmd_Register("importres", &ScummDebugger::Cmd_ImportRes);
 
-		if ((_s->_gameId == GID_LOOM) || (_s->_gameId == GID_LOOM256))
+		if ((_s->_features & GF_LOOM))
 			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->_gameId != GID_LOOM && _s->_gameId != GID_LOOM256) {
+	if (!(_s->_features & GF_LOOM)) {
 		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.181
retrieving revision 2.182
diff -u -d -r2.181 -r2.182
--- gfx.cpp	31 Jul 2003 18:35:00 -0000	2.181
+++ gfx.cpp	6 Aug 2003 09:30:48 -0000	2.182
@@ -664,7 +664,7 @@
 	_flashlight.x = x - _flashlight.w / 2 - _screenStartStrip * 8;
 	_flashlight.y = y - _flashlight.h / 2;
 
-	if (_gameId == GID_LOOM || _gameId == GID_LOOM256)
+	if (_features & GF_LOOM)
 		_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 (_gameId == GID_LOOM || _gameId == GID_LOOM256) {
+	if (_features & GF_LOOM) {
 		int w = 0;
 
 		_cursor.width = 8;

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- script_v5.cpp	6 Aug 2003 09:10:19 -0000	1.143
+++ script_v5.cpp	6 Aug 2003 09:30:48 -0000	1.144
@@ -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 ((_gameId != GID_LOOM256) && (_gameId != GID_LOOM)) {
+		if (!(_features & GF_LOOM)) {
 			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.279
retrieving revision 1.280
diff -u -d -r1.279 -r1.280
--- scumm.h	6 Aug 2003 09:10:19 -0000	1.279
+++ scumm.h	6 Aug 2003 09:30:48 -0000	1.280
@@ -85,6 +85,7 @@
 	GF_AFTER_HEV7          = 1 << 15,
 	GF_FMTOWNS             = 1 << 16,
 	GF_INDY3               = 1 << 17,
+	GF_LOOM                = 1 << 18,
 
 	GF_EXTERNAL_CHARSET    = GF_SMALL_HEADER
 };

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.317
retrieving revision 2.318
diff -u -d -r2.317 -r2.318
--- scummvm.cpp	6 Aug 2003 09:10:19 -0000	2.317
+++ scummvm.cpp	6 Aug 2003 09:30:48 -0000	2.318
@@ -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, "00.LFL"},
+	 GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALING | GF_USE_KEY | GF_16COLOR | GF_OLD_BUNDLE | GF_LOOM, "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_AUDIOTRACKS, "000.LFL"},
+	 GF_SMALL_HEADER | GF_USE_KEY | GF_LOOM | 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,