ScummVM

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6404/queen

Modified Files:
	cutaway.cpp 
Log Message:
Fix for bug #921681 - clear _quickSave when exiting cutaways


Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- cutaway.cpp	23 Mar 2004 20:34:19 -0000	1.126
+++ cutaway.cpp	23 Mar 2004 23:47:01 -0000	1.127
@@ -995,7 +995,9 @@
 
 	_vm->input()->cutawayRunning(false);
 	_vm->input()->cutawayQuitReset();
-
+	_vm->input()->quickSaveReset();
+	_vm->input()->quickLoadReset();
+	
 	if (_songBeforeComic > 0)
 		_vm->sound()->playSong(_songBeforeComic);
 	else if (_lastSong > 0)

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5273/queen

Modified Files:
      Tag: branch-0-6-0
	cutaway.cpp 
Log Message:
Fix for bug #921681 - clear _quickSave when exiting cutaways


Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.123.2.3
retrieving revision 1.123.2.4
diff -u -d -r1.123.2.3 -r1.123.2.4
--- cutaway.cpp	23 Mar 2004 20:32:17 -0000	1.123.2.3
+++ cutaway.cpp	23 Mar 2004 23:46:36 -0000	1.123.2.4
@@ -995,7 +995,9 @@
 
 	_vm->input()->cutawayRunning(false);
 	_vm->input()->cutawayQuitReset();
-
+	_vm->input()->quickSaveReset();
+	_vm->input()->quickLoadReset();
+	
 	if (_songBeforeComic > 0)
 		_vm->sound()->playSong(_songBeforeComic);
 	else if (_lastSong > 0)

Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26853

Modified Files:
	dimuse.cpp 
Log Message:
changed a little hook id code

Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- dimuse.cpp	2 Mar 2004 20:35:48 -0000	1.50
+++ dimuse.cpp	23 Mar 2004 22:51:44 -0000	1.51
@@ -211,9 +211,17 @@
 	if (jumpId != -1) {
 		int region = _sound->getRegionIdByJumpId(_track[track].soundHandle, jumpId);
 		if (region != -1) {
-			_track[track].curRegion = region;
-			debug(5, "switchToNextRegion-sound(%d) jump to %d region, curHookId: %d", _track[track].soundId, _track[track].curRegion, _track[track].curHookId);
-			_track[track].curHookId = 0;
+			int sampleHookId = _sound->getJumpHookId(_track[track].soundHandle, jumpId);
+			if (sampleHookId != 0) {
+				if (_track[track].curHookId == sampleHookId) {
+					_track[track].curRegion = region;
+					debug(5, "switchToNextRegion-sound(%d) jump to %d region, curHookId: %d", _track[track].soundId, _track[track].curRegion, _track[track].curHookId);
+					_track[track].curHookId = 0;
+				}
+			} else {
+				_track[track].curRegion = region;
+				debug(5, "switchToNextRegion-sound(%d) jump to %d region, curHookId: %d", _track[track].soundId, _track[track].curRegion, _track[track].curHookId);
+			}
 		}
 	}

Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9670

Modified Files:
	dimuse.h dimuse_music.cpp dimuse_tables.cpp 
Log Message:
fixed fade out delay

Index: dimuse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- dimuse.h	2 Mar 2004 20:35:48 -0000	1.32
+++ dimuse.h	23 Mar 2004 21:42:47 -0000	1.33
@@ -178,7 +178,7 @@
 	char name[20];
 	byte param;
 	byte hookId;
-	int16 fadeDelay;
+	int16 fadeOut60TicksDelay;
 	char filename[13];
 };
 

Index: dimuse_music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_music.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- dimuse_music.cpp	3 Mar 2004 10:56:46 -0000	1.17
+++ dimuse_music.cpp	23 Mar 2004 21:42:47 -0000	1.18
@@ -306,17 +306,17 @@
 			setFade(table->soundId, 127, 120);
 			break;
 		case 2:
-			fadeOutMusic(table->fadeDelay);
+			fadeOutMusic(table->fadeOut60TicksDelay);
 			startMusic(table->filename, table->soundId, table->hookId, 127);
 			break;
 		case 3:
 			if ((!sequence) && (table->param != 0)) {
 				if (table->param == _comiStateMusicTable[_curMusicState].param) {
-					fadeOutMusic(table->fadeDelay);
+					fadeOutMusic(table->fadeOut60TicksDelay);
 					startMusic(table->filename, table->soundId, 0, 127);
 				}
 			} else {
-				fadeOutMusic(table->fadeDelay);
+				fadeOutMusic(table->fadeOut60TicksDelay);
 				startMusic(table->filename, table->soundId, hookId, 127);
 			}
 			break;
@@ -325,7 +325,7 @@
 			startMusic(table->filename, table->soundId, table->hookId, 127);
 			break;
 		case 12:
-			fadeOutMusic(table->fadeDelay);
+			fadeOutMusic(table->fadeOut60TicksDelay);
 			startMusic(table->filename, table->soundId, table->hookId, 127);
 			break;
 	}

Index: dimuse_tables.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_tables.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- dimuse_tables.cpp	2 Mar 2004 20:35:48 -0000	1.15
+++ dimuse_tables.cpp	23 Mar 2004 21:42:47 -0000	1.16
@@ -152,7 +152,7 @@
 };
 
 const imuseDigTable _digStateMusicTable[] = {
-	{0, 1000, "STATE_NULL",          0, 0, ""},
+	{0,   60, "STATE_NULL",          0, 0, ""},
 	{0, 1001, "stateNoChange",       0, 0, ""},
 	{3, 1100, "stateAstShip",        2, 0, "ASTERO~1.IMU"},
 	{3, 1120, "stateAstClose",       2, 0, "ASTERO~2.IMU"},
@@ -293,190 +293,190 @@
 const imuseComiTable _comiStateMusicTable[] = {
 	{0, 1000, "STATE_NULL",         0, 0,    0, ""},
 	{0, 1001, "stateNoChange",      0, 0,    0, ""},
-	{3, 1098, "stateCredits1",      0, 0, 1000, "1098-C~1.IMX"},
-	{3, 1099, "stateMenu",          0, 0, 1000, "1099-M~1.IMX"},
-	{3, 1100, "stateHold1",         4, 0, 1000, "1100-H~1.IMX"},
-	{3, 1101, "stateWaterline1",    4, 0, 1000, "1101-W~1.IMX"},
-	{3, 1102, "stateHold2",         6, 1, 1000, "1102-H~1.IMX"},
-	{3, 1103, "stateWaterline2",    6, 0, 1000, "1103-W~1.IMX"},
-	{3, 1104, "stateCannon",        0, 0, 1000, "1104-C~1.IMX"},
-	{3, 1105, "stateTreasure",      0, 0, 1000, "1105-T~1.IMX"},
-	{3, 1200, "stateFortBase",     10, 1, 1000, "1200-F~1.IMX"},
-	{3, 1201, "statePreFort",      10, 1, 1000, "1201-P~1.IMX"},
-	{3, 1202, "statePreVooOut",    12, 0, 1000, "1202-P~1.IMX"},
-	{3, 1203, "statePreVooIn",     12, 0, 1000, "1203-P~1.IMX"},
-	{3, 1204, "statePreVooLady",   12, 0, 1000, "1204-P~1.IMX"},
-	{3, 1205, "stateVoodooOut",     0, 0, 1000, "1205-V~1.IMX"},
-	{3, 1210, "stateVoodooIn",      0, 0, 1000, "1210-V~1.IMX"},
-	{12,1212, "stateVoodooInAlt",   0, 1,  700, "1210-V~1.IMX"},
-	{3, 1215, "stateVoodooLady",    0, 0, 1000, "1215-V~1.IMX"},
-	{3, 1219, "statePrePlundermap", 0, 0, 1000, "1219-P~1.IMX"},
-	{3, 1220, "statePlundermap",    0, 0, 1000, "1220-P~1.IMX"},
-	{3, 1222, "statePreCabana",     0, 0, 1000, "1222-P~1.IMX"},
-	{3, 1223, "stateCabana",        0, 0, 1000, "1223-C~1.IMX"},
-	{3, 1224, "statePostCabana",   23, 0, 1000, "1224-P~1.IMX"},
-	{3, 1225, "stateBeachClub",    23, 0, 1000, "1225-B~1.IMX"},
-	{3, 1230, "stateCliff",         0, 0, 1000, "1230-C~1.IMX"},
-	{3, 1232, "stateBelly",         0, 0,  800, "1232-B~1.IMX"},
-	{3, 1235, "stateQuicksand",     0, 0, 1000, "1235-Q~1.IMX"},
-	{3, 1240, "stateDangerBeach",   0, 0,  800, "1240-D~1.IMX"},
-	{12,1241, "stateDangerBeachAlt",0, 2,  800, "1240-D~1.IMX"},
-	{3, 1245, "stateRowBoat",       0, 0, 1000, "1245-R~1.IMX"},
-	{3, 1247, "stateAlongside",     0, 0,  800, "1247-A~1.IMX"},
-	{12,1248, "stateAlongsideAlt",  0, 1,  800, "1247-A~1.IMX"},
-	{3, 1250, "stateChimpBoat",     0, 0,  500, "1250-C~1.IMX"},
-	{3, 1255, "stateMrFossey",      0, 0,  800, "1255-M~1.IMX"},
-	{3, 1259, "statePreTown",       0, 0, 1000, "1259-P~1.IMX"},
-	{3, 1260, "stateTown",          0, 0, 1000, "1260-T~1.IMX"},
-	{3, 1264, "statePreMeadow",     0, 0, 1000, "1264-P~1.IMX"},
-	{3, 1265, "stateMeadow",        0, 0, 1000, "1265-M~1.IMX"},
-	{3, 1266, "stateMeadowAmb",     0, 0, 1000, "1266-M~1.IMX"},
-	{3, 1270, "stateWardrobePre",  40, 0, 1000, "1270-W~1.IMX"},
-	{3, 1272, "statePreShow",      40, 0, 1000, "1272-P~1.IMX"},
-	{3, 1274, "stateWardrobeShow", 42, 0, 1000, "1274-W~1.IMX"},
-	{3, 1276, "stateShow",         42, 0, 1000, "1276-S~1.IMX"},
-	{3, 1277, "stateWardrobeJug",  44, 0, 1000, "1277-W~1.IMX"},
-	{3, 1278, "stateJuggling",     44, 0, 1000, "1278-J~1.IMX"},
-	{3, 1279, "statePostShow",      0, 0, 1000, "1279-P~1.IMX"},
-	{3, 1280, "stateChickenShop",   0, 0, 1000, "1280-C~1.IMX"},
-	{3, 1285, "stateBarberShop",   48, 0, 1000, "1285-B~1.IMX"},
-	{3, 1286, "stateVanHelgen",    48, 0, 1000, "1286-V~1.IMX"},
-	{3, 1287, "stateBill",         48, 0, 1000, "1287-B~1.IMX"},
-	{3, 1288, "stateHaggis",       48, 0, 1000, "1288-H~1.IMX"},
-	{3, 1289, "stateRottingham",   48, 0, 1000, "1289-R~1.IMX"},
-	{3, 1305, "stateDeck",          0, 0, 1000, "1305-D~1.IMX"},
-	{3, 1310, "stateCombatMap",     0, 0, 1000, "1310-C~1.IMX"},
-	{3, 1320, "stateShipCombat",    0, 0, 1000, "1320-S~1.IMX"},
-	{3, 1325, "stateSwordfight",    0, 0, 1000, "1325-S~1.IMX"},
-	{3, 1327, "stateSwordRott",     0, 0, 1000, "1327-S~1.IMX"},
-	{3, 1330, "stateTownEdge",      0, 0, 1000, "1330-T~1.IMX"},
-	{3, 1335, "stateSwordLose",     0, 0, 1000, "1335-S~1.IMX"},
-	{3, 1340, "stateSwordWin",      0, 0, 1000, "1340-S~1.IMX"},
-	{3, 1345, "stateGetMap",        0, 0, 1000, "1345-G~1.IMX"},
-	{3, 1400, "stateWreckBeach",    0, 0, 1000, "1400-W~1.IMX"},
-	{3, 1405, "stateBloodMap",     63, 0, 1000, "1405-B~1.IMX"},
-	{3, 1410, "stateClearing",      0, 0, 1000, "1410-C~1.IMX"},
-	{3, 1415, "stateLighthouse",   63, 0, 1000, "1415-L~1.IMX"},
-	{3, 1420, "stateVillage",      66, 0, 1000, "1420-V~1.IMX"},
-	{3, 1423, "stateVolcano",      66, 0, 1000, "1423-V~1.IMX"},
-	{3, 1425, "stateAltar",        66, 0, 1000, "1425-A~1.IMX"},
-	{3, 1430, "stateHotelOut",      0, 0, 1000, "1430-H~1.IMX"},
-	{3, 1435, "stateHotelBar",     70, 0, 1000, "1435-H~1.IMX"},
-	{3, 1440, "stateHotelIn",      70, 0, 1000, "1440-H~1.IMX"},
-	{3, 1445, "stateTarotLady",    70, 0, 1000, "1445-T~1.IMX"},
-	{3, 1447, "stateGoodsoup",     70, 0, 1000, "1447-G~1.IMX"},
-	{3, 1448, "stateGuestRoom",     0, 0, 1000, "1448-G~1.IMX"},
-	{3, 1450, "stateWindmill",     63, 0, 1000, "1450-W~1.IMX"},
-	{3, 1455, "stateCemetary",      0, 0, 1000, "1455-C~1.IMX"},
-	{3, 1460, "stateCrypt",        77, 0, 1000, "1460-C~1.IMX"},
-	{3, 1463, "stateGraveDigger",  77, 0, 1000, "1463-G~1.IMX"},
-	{3, 1465, "stateMonkey1",       0, 0, 1000, "1465-M~1.IMX"},
-	{3, 1475, "stateStanDark",      0, 0, 1000, "1475-S~1.IMX"},
-	{3, 1477, "stateStanLight",     0, 0, 1000, "1477-S~1.IMX"},
-	{3, 1480, "stateEggBeach",     63, 0, 1000, "1480-E~1.IMX"},
-	{3, 1485, "stateSkullIsland",   0, 0, 1000, "1485-S~1.IMX"},
-	{3, 1490, "stateSmugglersCave", 0, 0, 1000, "1490-S~1.IMX"},
-	{3, 1500, "stateLeChuckTalk",   0, 0, 1000, "1500-L~1.IMX"},
-	{3, 1505, "stateCarnival",      0, 0, 1000, "1505-C~1.IMX"},
-	{3, 1511, "stateHang",         87, 0, 1000, "1511-H~1.IMX"},
-	{3, 1512, "stateRum",          87, 0, 1000, "1512-RUM.IMX"},
-	{3, 1513, "stateTorture",      87, 0, 1000, "1513-T~1.IMX"},
-	{3, 1514, "stateSnow",         87, 0, 1000, "1514-S~1.IMX"},
-	{3, 1515, "stateCredits",       0, 0, 1000, "1515-C~1.IMX"},
-	{3, 1520, "stateCarnAmb",       0, 0, 1000, "1520-C~1.IMX"},
+	{3, 1098, "stateCredits1",      0, 0,   60, "1098-C~1.IMX"},
+	{3, 1099, "stateMenu",          0, 0,   60, "1099-M~1.IMX"},
+	{3, 1100, "stateHold1",         4, 0,   60, "1100-H~1.IMX"},
+	{3, 1101, "stateWaterline1",    4, 0,   60, "1101-W~1.IMX"},
+	{3, 1102, "stateHold2",         6, 1,   60, "1102-H~1.IMX"},
+	{3, 1103, "stateWaterline2",    6, 0,   60, "1103-W~1.IMX"},
+	{3, 1104, "stateCannon",        0, 0,   60, "1104-C~1.IMX"},
+	{3, 1105, "stateTreasure",      0, 0,   60, "1105-T~1.IMX"},
+	{3, 1200, "stateFortBase",     10, 1,   60, "1200-F~1.IMX"},
+	{3, 1201, "statePreFort",      10, 1,   60, "1201-P~1.IMX"},
+	{3, 1202, "statePreVooOut",    12, 0,   60, "1202-P~1.IMX"},
+	{3, 1203, "statePreVooIn",     12, 0,   60, "1203-P~1.IMX"},
+	{3, 1204, "statePreVooLady",   12, 0,   60, "1204-P~1.IMX"},
+	{3, 1205, "stateVoodooOut",     0, 0,   60, "1205-V~1.IMX"},
+	{3, 1210, "stateVoodooIn",      0, 0,   60, "1210-V~1.IMX"},
+	{12,1212, "stateVoodooInAlt",   0, 1,   42, "1210-V~1.IMX"},
+	{3, 1215, "stateVoodooLady",    0, 0,   60, "1215-V~1.IMX"},
+	{3, 1219, "statePrePlundermap", 0, 0,   60, "1219-P~1.IMX"},
+	{3, 1220, "statePlundermap",    0, 0,   60, "1220-P~1.IMX"},
+	{3, 1222, "statePreCabana",     0, 0,   60, "1222-P~1.IMX"},
+	{3, 1223, "stateCabana",        0, 0,   60, "1223-C~1.IMX"},
+	{3, 1224, "statePostCabana",   23, 0,   60, "1224-P~1.IMX"},
+	{3, 1225, "stateBeachClub",    23, 0,   60, "1225-B~1.IMX"},
+	{3, 1230, "stateCliff",         0, 0,   60, "1230-C~1.IMX"},
+	{3, 1232, "stateBelly",         0, 0,   48, "1232-B~1.IMX"},
+	{3, 1235, "stateQuicksand",     0, 0,   60, "1235-Q~1.IMX"},
+	{3, 1240, "stateDangerBeach",   0, 0,   48, "1240-D~1.IMX"},
+	{12,1241, "stateDangerBeachAlt",0, 2,   48, "1240-D~1.IMX"},
+	{3, 1245, "stateRowBoat",       0, 0,   60, "1245-R~1.IMX"},
+	{3, 1247, "stateAlongside",     0, 0,   48, "1247-A~1.IMX"},
+	{12,1248, "stateAlongsideAlt",  0, 1,   48, "1247-A~1.IMX"},
+	{3, 1250, "stateChimpBoat",     0, 0,   30, "1250-C~1.IMX"},
+	{3, 1255, "stateMrFossey",      0, 0,   48, "1255-M~1.IMX"},
+	{3, 1259, "statePreTown",       0, 0,   60, "1259-P~1.IMX"},
+	{3, 1260, "stateTown",          0, 0,   60, "1260-T~1.IMX"},
+	{3, 1264, "statePreMeadow",     0, 0,   60, "1264-P~1.IMX"},
+	{3, 1265, "stateMeadow",        0, 0,   60, "1265-M~1.IMX"},
+	{3, 1266, "stateMeadowAmb",     0, 0,   60, "1266-M~1.IMX"},
+	{3, 1270, "stateWardrobePre",  40, 0,   60, "1270-W~1.IMX"},
+	{3, 1272, "statePreShow",      40, 0,   60, "1272-P~1.IMX"},
+	{3, 1274, "stateWardrobeShow", 42, 0,   60, "1274-W~1.IMX"},
+	{3, 1276, "stateShow",         42, 0,   60, "1276-S~1.IMX"},
+	{3, 1277, "stateWardrobeJug",  44, 0,   60, "1277-W~1.IMX"},
+	{3, 1278, "stateJuggling",     44, 0,   60, "1278-J~1.IMX"},
+	{3, 1279, "statePostShow",      0, 0,   60, "1279-P~1.IMX"},
+	{3, 1280, "stateChickenShop",   0, 0,   60, "1280-C~1.IMX"},
+	{3, 1285, "stateBarberShop",   48, 0,   60, "1285-B~1.IMX"},
+	{3, 1286, "stateVanHelgen",    48, 0,   60, "1286-V~1.IMX"},
+	{3, 1287, "stateBill",         48, 0,   60, "1287-B~1.IMX"},
+	{3, 1288, "stateHaggis",       48, 0,   60, "1288-H~1.IMX"},
+	{3, 1289, "stateRottingham",   48, 0,   60, "1289-R~1.IMX"},
+	{3, 1305, "stateDeck",          0, 0,   60, "1305-D~1.IMX"},
+	{3, 1310, "stateCombatMap",     0, 0,   60, "1310-C~1.IMX"},
+	{3, 1320, "stateShipCombat",    0, 0,   60, "1320-S~1.IMX"},
+	{3, 1325, "stateSwordfight",    0, 0,   60, "1325-S~1.IMX"},
+	{3, 1327, "stateSwordRott",     0, 0,   60, "1327-S~1.IMX"},
+	{3, 1330, "stateTownEdge",      0, 0,   60, "1330-T~1.IMX"},
+	{3, 1335, "stateSwordLose",     0, 0,   60, "1335-S~1.IMX"},
+	{3, 1340, "stateSwordWin",      0, 0,   60, "1340-S~1.IMX"},
+	{3, 1345, "stateGetMap",        0, 0,   60, "1345-G~1.IMX"},
+	{3, 1400, "stateWreckBeach",    0, 0,   60, "1400-W~1.IMX"},
+	{3, 1405, "stateBloodMap",     63, 0,   60, "1405-B~1.IMX"},
+	{3, 1410, "stateClearing",      0, 0,   60, "1410-C~1.IMX"},
+	{3, 1415, "stateLighthouse",   63, 0,   60, "1415-L~1.IMX"},
+	{3, 1420, "stateVillage",      66, 0,   60, "1420-V~1.IMX"},
+	{3, 1423, "stateVolcano",      66, 0,   60, "1423-V~1.IMX"},
+	{3, 1425, "stateAltar",        66, 0,   60, "1425-A~1.IMX"},
+	{3, 1430, "stateHotelOut",      0, 0,   60, "1430-H~1.IMX"},
+	{3, 1435, "stateHotelBar",     70, 0,   60, "1435-H~1.IMX"},
+	{3, 1440, "stateHotelIn",      70, 0,   60, "1440-H~1.IMX"},
+	{3, 1445, "stateTarotLady",    70, 0,   60, "1445-T~1.IMX"},
+	{3, 1447, "stateGoodsoup",     70, 0,   60, "1447-G~1.IMX"},
+	{3, 1448, "stateGuestRoom",     0, 0,   60, "1448-G~1.IMX"},
+	{3, 1450, "stateWindmill",     63, 0,   60, "1450-W~1.IMX"},
+	{3, 1455, "stateCemetary",      0, 0,   60, "1455-C~1.IMX"},
+	{3, 1460, "stateCrypt",        77, 0,   60, "1460-C~1.IMX"},
+	{3, 1463, "stateGraveDigger",  77, 0,   60, "1463-G~1.IMX"},
+	{3, 1465, "stateMonkey1",       0, 0,   60, "1465-M~1.IMX"},
+	{3, 1475, "stateStanDark",      0, 0,   60, "1475-S~1.IMX"},
+	{3, 1477, "stateStanLight",     0, 0,   60, "1477-S~1.IMX"},
+	{3, 1480, "stateEggBeach",     63, 0,   60, "1480-E~1.IMX"},
+	{3, 1485, "stateSkullIsland",   0, 0,   60, "1485-S~1.IMX"},
+	{3, 1490, "stateSmugglersCave", 0, 0,   60, "1490-S~1.IMX"},
+	{3, 1500, "stateLeChuckTalk",   0, 0,   60, "1500-L~1.IMX"},
+	{3, 1505, "stateCarnival",      0, 0,   60, "1505-C~1.IMX"},
+	{3, 1511, "stateHang",         87, 0,   60, "1511-H~1.IMX"},
+	{3, 1512, "stateRum",          87, 0,   60, "1512-RUM.IMX"},
+	{3, 1513, "stateTorture",      87, 0,   60, "1513-T~1.IMX"},
+	{3, 1514, "stateSnow",         87, 0,   60, "1514-S~1.IMX"},
+	{3, 1515, "stateCredits",       0, 0,   60, "1515-C~1.IMX"},
+	{3, 1520, "stateCarnAmb",       0, 0,   60, "1520-C~1.IMX"},
 	{0,   -1, "",                   0, 0,    0, ""}
 };
 
 const imuseComiTable _comiSeqMusicTable[] = {
 	{0, 2000, "SEQ_NULL",        0, 0,    0, ""},
 	{0, 2100, "seqINTRO",        0, 0,    0, ""},
-	{3, 2105, "seqInterlude1",   0, 0, 1000, "2105-I~1.IMX"},
+	{3, 2105, "seqInterlude1",   0, 0,   60, "2105-I~1.IMX"},
 	{8, 2110, "seqLastBoat",     0, 1,    0, ""},
 	{0, 2115, "seqSINK_SHIP",    0, 0,    0, ""},
-	{0, 2120, "seqCURSED_RING",  0, 0, 1000, ""},
-	{3, 2200, "seqInterlude2",   0, 0, 1000, "2200-I~1.IMX"},
-	{3, 2210, "seqKidnapped",    0, 0, 1000, "2210-K~1.IMX"},
+	{0, 2120, "seqCURSED_RING",  0, 0,   60, ""},
+	{3, 2200, "seqInterlude2",   0, 0,   60, "2200-I~1.IMX"},
+	{3, 2210, "seqKidnapped",    0, 0,   60, "2210-K~1.IMX"},
 	{8, 2220, "seqSnakeVomits",  0, 1,    0, ""},
 	{8, 2222, "seqPopBalloon",   0, 1,    0, ""},
-	{3, 2225, "seqDropBalls",    0, 0, 1000, "2225-D~1.IMX"},
-	{4, 2232, "seqArriveBarber", 0, 0, 1000, "2232-A~1.IMX"},
-	{3, 2233, "seqAtonal",       0, 0, 1000, "2233-A~1.IMX"},
-	{3, 2235, "seqShaveHead1",   0, 0, 1000, "2235-S~1.IMX"},
-	{2, 2236, "seqShaveHead2",   0, 2, 1000, "2235-S~1.IMX"},
-	{3, 2245, "seqCaberLose",    0, 0, 1000, "2245-C~1.IMX"},
-	{3, 2250, "seqCaberWin",     0, 0, 1000, "2250-C~1.IMX"},
-	{3, 2255, "seqDuel1",        0, 0, 1000, "2255-D~1.IMX"},
-	{2, 2256, "seqDuel2",        0, 2, 1000, "2255-D~1.IMX"},
-	{2, 2257, "seqDuel3",        0, 3, 1000, "2255-D~1.IMX"},
-	{3, 2260, "seqBlowUpTree1",  0, 0, 1000, "2260-B~1.IMX"},
-	{2, 2261, "seqBlowUpTree2",  0, 2, 1000, "2260-B~1.IMX"},
-	{3, 2275, "seqMonkeys",      0, 0, 1000, "2275-M~1.IMX"},
+	{3, 2225, "seqDropBalls",    0, 0,   60, "2225-D~1.IMX"},
+	{4, 2232, "seqArriveBarber", 0, 0,   60, "2232-A~1.IMX"},
+	{3, 2233, "seqAtonal",       0, 0,   60, "2233-A~1.IMX"},
+	{3, 2235, "seqShaveHead1",   0, 0,   60, "2235-S~1.IMX"},
+	{2, 2236, "seqShaveHead2",   0, 2,   60, "2235-S~1.IMX"},
+	{3, 2245, "seqCaberLose",    0, 0,   60, "2245-C~1.IMX"},
+	{3, 2250, "seqCaberWin",     0, 0,   60, "2250-C~1.IMX"},
+	{3, 2255, "seqDuel1",        0, 0,   60, "2255-D~1.IMX"},
+	{2, 2256, "seqDuel2",        0, 2,   60, "2255-D~1.IMX"},
+	{2, 2257, "seqDuel3",        0, 3,   60, "2255-D~1.IMX"},
+	{3, 2260, "seqBlowUpTree1",  0, 0,   60, "2260-B~1.IMX"},
+	{2, 2261, "seqBlowUpTree2",  0, 2,   60, "2260-B~1.IMX"},
+	{3, 2275, "seqMonkeys",      0, 0,   60, "2275-M~1.IMX"},
 	{9, 2277, "seqAttack",       0, 1,    0, ""},
-	{3, 2285, "seqSharks",       0, 0, 1000, "2285-S~1.IMX"},
-	{3, 2287, "seqTowelWalk",    0, 0, 1000, "2287-T~1.IMX"},
+	{3, 2285, "seqSharks",       0, 0,   60, "2285-S~1.IMX"},
+	{3, 2287, "seqTowelWalk",    0, 0,   60, "2287-T~1.IMX"},
 	{0, 2293, "seqNICE_BOOTS",   0, 0,    0, ""},
 	{0, 2295, "seqBIG_BONED",    0, 0,    0, ""},
-	{3, 2300, "seqToBlood",      0, 0, 1000, "2300-T~1.IMX"},
-	{3, 2301, "seqInterlude3",   0, 0, 1000, "2301-I~1.IMX"},
-	{3, 2302, "seqRott1",        0, 0, 1000, "2302-R~1.IMX"},
-	{2, 2304, "seqRott2",        0, 2, 1000, "2302-R~1.IMX"},
-	{2, 2305, "seqRott2b",       0,21, 1000, "2302-R~1.IMX"},
-	{2, 2306, "seqRott3",        0, 3, 1000, "2302-R~1.IMX"},
-	{2, 2308, "seqRott4",        0, 4, 1000, "2302-R~1.IMX"},
-	{2, 2309, "seqRott5",        0, 5, 1000, "2302-R~1.IMX"},
-	{3, 2311, "seqVerse1",       0, 0, 1000, "2311-S~1.IMX"},
-	{2, 2312, "seqVerse2",       0, 2, 1000, "2311-S~1.IMX"},
-	{2, 2313, "seqVerse3",       0, 3, 1000, "2311-S~1.IMX"},
-	{2, 2314, "seqVerse4",       0, 4, 1000, "2311-S~1.IMX"},
-	{2, 2315, "seqVerse5",       0, 5, 1000, "2311-S~1.IMX"},
-	{2, 2316, "seqVerse6",       0, 6, 1000, "2311-S~1.IMX"},
-	{2, 2317, "seqVerse7",       0, 7, 1000, "2311-S~1.IMX"},
-	{2, 2318, "seqVerse8",       0, 8, 1000, "2311-S~1.IMX"},
-	{2, 2319, "seqSongEnd",      0, 9, 1000, "2311-S~1.IMX"},
-	{2, 2336, "seqRiposteLose",  0, 0, 1000, "2336-R~1.IMX"},
-	{2, 2337, "seqRiposteWin",   0, 0, 1000, "2337-R~1.IMX"},
-	{2, 2338, "seqInsultLose",   0, 0, 1000, "2338-I~1.IMX"},
-	{2, 2339, "seqInsultWin",    0, 0, 1000, "2339-I~1.IMX"},
-	{3, 2340, "seqSwordLose",    0, 0, 1000, "1335-S~1.IMX"},
-	{3, 2345, "seqSwordWin",     0, 0, 1000, "1340-S~1.IMX"},
-	{3, 2347, "seqGetMap",       0, 0, 1000, "1345-G~1.IMX"},
-	{3, 2400, "seqInterlude4",   0, 0, 1000, "2400-I~1.IMX"},
+	{3, 2300, "seqToBlood",      0, 0,   60, "2300-T~1.IMX"},
+	{3, 2301, "seqInterlude3",   0, 0,   60, "2301-I~1.IMX"},
+	{3, 2302, "seqRott1",        0, 0,   60, "2302-R~1.IMX"},
+	{2, 2304, "seqRott2",        0, 2,   60, "2302-R~1.IMX"},
+	{2, 2305, "seqRott2b",       0,21,   60, "2302-R~1.IMX"},
+	{2, 2306, "seqRott3",        0, 3,   60, "2302-R~1.IMX"},
+	{2, 2308, "seqRott4",        0, 4,   60, "2302-R~1.IMX"},
+	{2, 2309, "seqRott5",        0, 5,   60, "2302-R~1.IMX"},
+	{3, 2311, "seqVerse1",       0, 0,   60, "2311-S~1.IMX"},
+	{2, 2312, "seqVerse2",       0, 2,   60, "2311-S~1.IMX"},
+	{2, 2313, "seqVerse3",       0, 3,   60, "2311-S~1.IMX"},
+	{2, 2314, "seqVerse4",       0, 4,   60, "2311-S~1.IMX"},
+	{2, 2315, "seqVerse5",       0, 5,   60, "2311-S~1.IMX"},
+	{2, 2316, "seqVerse6",       0, 6,   60, "2311-S~1.IMX"},
+	{2, 2317, "seqVerse7",       0, 7,   60, "2311-S~1.IMX"},
+	{2, 2318, "seqVerse8",       0, 8,   60, "2311-S~1.IMX"},
+	{2, 2319, "seqSongEnd",      0, 9,   60, "2311-S~1.IMX"},
+	{2, 2336, "seqRiposteLose",  0, 0,   60, "2336-R~1.IMX"},
+	{2, 2337, "seqRiposteWin",   0, 0,   60, "2337-R~1.IMX"},
+	{2, 2338, "seqInsultLose",   0, 0,   60, "2338-I~1.IMX"},
+	{2, 2339, "seqInsultWin",    0, 0,   60, "2339-I~1.IMX"},
+	{3, 2340, "seqSwordLose",    0, 0,   60, "1335-S~1.IMX"},
+	{3, 2345, "seqSwordWin",     0, 0,   60, "1340-S~1.IMX"},
+	{3, 2347, "seqGetMap",       0, 0,   60, "1345-G~1.IMX"},
+	{3, 2400, "seqInterlude4",   0, 0,   60, "2400-I~1.IMX"},
 	{0, 2405, "seqSHIPWRECK",    0, 0,    0, ""},
-	{3, 2408, "seqFakeCredits",  0, 0, 1000, "2408-F~1.IMX"},
-	{3, 2410, "seqPassOut",      0, 0, 1000, "2410-P~1.IMX"},
-	{3, 2414, "seqGhostTalk",    0, 0, 1000, "2414-G~1.IMX"},
-	{2, 2415, "seqGhostWedding", 0, 1, 1000, "2414-G~1.IMX"},
-	{3, 2420, "seqEruption",     0, 0, 1000, "2420-E~1.IMX"},
-	{3, 2425, "seqSacrifice",    0, 0, 1000, "2425-S~1.IMX"},
-	{2, 2426, "seqSacrificeEnd", 0, 1, 1000, "2425-S~1.IMX"},
-	{3, 2430, "seqScareDigger",  0, 0, 1000, "2430-S~1.IMX"},
-	{3, 2445, "seqSkullArrive",  0, 0, 1000, "2445-S~1.IMX"},
-	{3, 2450, "seqFloat",        0, 0, 1000, "2450-C~1.IMX"},
-	{2, 2451, "seqFall",         0, 1, 1000, "2450-C~1.IMX"},
-	{2, 2452, "seqUmbrella",     0, 0, 1000, "2450-C~1.IMX"},
-	{3, 2460, "seqFight",        0, 0, 1000, "2460-F~1.IMX"},
+	{3, 2408, "seqFakeCredits",  0, 0,   60, "2408-F~1.IMX"},
+	{3, 2410, "seqPassOut",      0, 0,   60, "2410-P~1.IMX"},
+	{3, 2414, "seqGhostTalk",    0, 0,   60, "2414-G~1.IMX"},
+	{2, 2415, "seqGhostWedding", 0, 1,   60, "2414-G~1.IMX"},
+	{3, 2420, "seqEruption",     0, 0,   60, "2420-E~1.IMX"},
+	{3, 2425, "seqSacrifice",    0, 0,   60, "2425-S~1.IMX"},
+	{2, 2426, "seqSacrificeEnd", 0, 1,   60, "2425-S~1.IMX"},
+	{3, 2430, "seqScareDigger",  0, 0,   60, "2430-S~1.IMX"},
+	{3, 2445, "seqSkullArrive",  0, 0,   60, "2445-S~1.IMX"},
+	{3, 2450, "seqFloat",        0, 0,   60, "2450-C~1.IMX"},
+	{2, 2451, "seqFall",         0, 1,   60, "2450-C~1.IMX"},
+	{2, 2452, "seqUmbrella",     0, 0,   60, "2450-C~1.IMX"},
+	{3, 2460, "seqFight",        0, 0,   60, "2460-F~1.IMX"},
 	{0, 2465, "seqLAVE_RIDE",    0, 0,    0, ""},
 	{0, 2470, "seqMORE_SLAW",    0, 0,    0, ""},
 	{0, 2475, "seqLIFT_CURSE",   0, 0,    0, ""},
-	{3, 2500, "seqInterlude5",   0, 0, 1000, "2500-I~1.IMX"},
-	{3, 2502, "seqExitSkycar",   0, 0, 1000, "2502-E~1.IMX"},
-	{3, 2504, "seqGrow1",        0, 0, 1000, "2504-G~1.IMX"},
-	{2, 2505, "seqGrow2",        0, 1, 1000, "2504-G~1.IMX"},
-	{3, 2508, "seqInterlude6",   0, 0, 1000, "2508-I~1.IMX"},
+	{3, 2500, "seqInterlude5",   0, 0,   60, "2500-I~1.IMX"},
+	{3, 2502, "seqExitSkycar",   0, 0,   60, "2502-E~1.IMX"},
+	{3, 2504, "seqGrow1",        0, 0,   60, "2504-G~1.IMX"},
+	{2, 2505, "seqGrow2",        0, 1,   60, "2504-G~1.IMX"},
+	{3, 2508, "seqInterlude6",   0, 0,   60, "2508-I~1.IMX"},
 	{0, 2515, "seqFINALE",       0, 0,    0, ""},
-	{3, 2520, "seqOut",          0, 0, 1000, "2520-OUT.IMX"},
-	{3, 2530, "seqZap1a",        0, 0, 1000, "2530-Z~1.IMX"},
-	{2, 2531, "seqZap1b",        0, 1, 1000, "2530-Z~1.IMX"},
-	{2, 2532, "seqZap1c",        0, 2, 1000, "2530-Z~1.IMX"},
-	{2, 2540, "seqZap2a",        0, 0, 1000, "2540-Z~1.IMX"},
-	{2, 2541, "seqZap2b",        0, 1, 1000, "2540-Z~1.IMX"},
-	{2, 2542, "seqZap2c",        0, 2, 1000, "2540-Z~1.IMX"},
-	{3, 2550, "seqZap3a",        0, 0, 1000, "2550-Z~1.IMX"},
-	{2, 2551, "seqZap3b",        0, 1, 1000, "2550-Z~1.IMX"},
-	{2, 2552, "seqZap3c",        0, 2, 1000, "2550-Z~1.IMX"},
-	{3, 2560, "seqZap4a",        0, 0, 1000, "2560-Z~1.IMX"},
-	{2, 2561, "seqZap4b",        0, 1, 1000, "2560-Z~1.IMX"},
-	{2, 2562, "seqZap4c",        0, 2, 1000, "2560-Z~1.IMX"},
+	{3, 2520, "seqOut",          0, 0,   60, "2520-OUT.IMX"},
+	{3, 2530, "seqZap1a",        0, 0,   60, "2530-Z~1.IMX"},
+	{2, 2531, "seqZap1b",        0, 1,   60, "2530-Z~1.IMX"},
+	{2, 2532, "seqZap1c",        0, 2,   60, "2530-Z~1.IMX"},
+	{2, 2540, "seqZap2a",        0, 0,   60, "2540-Z~1.IMX"},
+	{2, 2541, "seqZap2b",        0, 1,   60, "2540-Z~1.IMX"},
+	{2, 2542, "seqZap2c",        0, 2,   60, "2540-Z~1.IMX"},
+	{3, 2550, "seqZap3a",        0, 0,   60, "2550-Z~1.IMX"},
+	{2, 2551, "seqZap3b",        0, 1,   60, "2550-Z~1.IMX"},
+	{2, 2552, "seqZap3c",        0, 2,   60, "2550-Z~1.IMX"},
+	{3, 2560, "seqZap4a",        0, 0,   60, "2560-Z~1.IMX"},
+	{2, 2561, "seqZap4b",        0, 1,   60, "2560-Z~1.IMX"},
+	{2, 2562, "seqZap4c",        0, 2,   60, "2560-Z~1.IMX"},
 	{0,   -1, "",                0, 0,    0, ""}
 };

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25387

Modified Files:
	cutaway.cpp grid.cpp logic.cpp queen.h sound.cpp talk.cpp 
Log Message:
Fix #922003 - FOTAQ crash on PocketPC

Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- cutaway.cpp	7 Mar 2004 10:46:01 -0000	1.125
+++ cutaway.cpp	23 Mar 2004 20:34:19 -0000	1.126
@@ -74,9 +74,9 @@
 	_comPanel = READ_BE_UINT16(ptr);
 	ptr += 2;
 	debug(6, "_comPanel = %i", _comPanel);
-
-	_cutawayObjectCount = (int16)READ_BE_UINT16(ptr);
+	_cutawayObjectCount = (int16)READ_BE_INT16(ptr);
 	ptr += 2;
+
 	debug(6, "_cutawayObjectCount = %i", _cutawayObjectCount);
 
 	if (_cutawayObjectCount < 0) {
@@ -86,7 +86,7 @@
 	else
 		_vm->input()->canQuit(true);
 
-	int16 flags1 = (int16)READ_BE_UINT16(ptr);
+	int16 flags1 = (int16)READ_BE_INT16(ptr);
 	ptr += 2;
 	debug(6, "flags1 = %i", flags1);
 
@@ -179,7 +179,7 @@
 	ptr = Talk::getString(ptr, _talkFile, MAX_FILENAME_LENGTH);
 	debug(6, "Talk file = '%s'", _talkFile);
 
-	_talkTo = (int16)READ_BE_UINT16(ptr);
+	_talkTo = (int16)READ_BE_INT16(ptr);
 	ptr += 2;
 	debug(6, "_talkTo = %i", _talkTo);
 }
@@ -188,23 +188,23 @@
 {
 	byte *oldPtr = ptr;
 
-	object.objectNumber  = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	object.moveToX      = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	object.moveToY      = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	object.bank           = (int16)READ_BE_UINT16(ptr); ptr += 2;      
-	object.animList      = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	object.execute        = (int16)READ_BE_UINT16(ptr); ptr += 2;    
-	object.limitBobX1   = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	object.limitBobY1   = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	object.limitBobX2   = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	object.limitBobY2   = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	object.specialMove   = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	object.animType      = (int16)READ_BE_UINT16(ptr); ptr += 2;   
-	object.fromObject    = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	object.bobStartX    = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	object.bobStartY    = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	object.room           = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	object.scale          = (int16)READ_BE_UINT16(ptr); ptr += 2;
+	object.objectNumber  = (int16)READ_BE_INT16(ptr); ptr += 2;
+	object.moveToX      = (int16)READ_BE_INT16(ptr); ptr += 2;
+	object.moveToY      = (int16)READ_BE_INT16(ptr); ptr += 2;
+	object.bank           = (int16)READ_BE_INT16(ptr); ptr += 2;      
+	object.animList      = (int16)READ_BE_INT16(ptr); ptr += 2;
+	object.execute        = (int16)READ_BE_INT16(ptr); ptr += 2;    
+	object.limitBobX1   = (int16)READ_BE_INT16(ptr); ptr += 2;
+	object.limitBobY1   = (int16)READ_BE_INT16(ptr); ptr += 2;
+	object.limitBobX2   = (int16)READ_BE_INT16(ptr); ptr += 2;
+	object.limitBobY2   = (int16)READ_BE_INT16(ptr); ptr += 2;
+	object.specialMove   = (int16)READ_BE_INT16(ptr); ptr += 2;
+	object.animType      = (int16)READ_BE_INT16(ptr); ptr += 2;   
+	object.fromObject    = (int16)READ_BE_INT16(ptr); ptr += 2;
+	object.bobStartX    = (int16)READ_BE_INT16(ptr); ptr += 2;
+	object.bobStartY    = (int16)READ_BE_INT16(ptr); ptr += 2;
+	object.room           = (int16)READ_BE_INT16(ptr); ptr += 2;
+	object.scale          = (int16)READ_BE_INT16(ptr); ptr += 2;
 
 	if ((ptr - oldPtr) != 17*sizeof(int16))
 		error("Wrong number of values read");
@@ -263,14 +263,14 @@
 
 byte *Cutaway::turnOnPeople(byte *ptr, CutawayObject &object) {
 	// Lines 1248-1259 in cutaway.c
-	object.personCount = (int16)READ_BE_UINT16(ptr);
+	object.personCount = (int16)READ_BE_INT16(ptr);
 	ptr += 2;
 
 	if (object.personCount > MAX_PERSON_COUNT)
 		error("[Cutaway::turnOnPeople] object.personCount > MAX_PERSON_COUNT");
 
 	for (int i = 0; i < object.personCount; i++) {
-		object.person[i] = (int16)READ_BE_UINT16(ptr);
+		object.person[i] = (int16)READ_BE_INT16(ptr);
 		ptr += 2;
 		//debug(6, "[%i] Turn on person %i", i, object.person[i]);
 	}
@@ -491,13 +491,13 @@
 		anim.originalFrame = _vm->logic()->findFrame(header);
 	}
 
-	anim.unpackFrame = (int16)READ_BE_UINT16(ptr);
+	anim.unpackFrame = (int16)READ_BE_INT16(ptr);
 	ptr += 2;
 
-	anim.speed = ((int16)READ_BE_UINT16(ptr)) / 3 + 1;
+	anim.speed = ((int16)READ_BE_INT16(ptr)) / 3 + 1;
 	ptr += 2;
 
-	anim.bank = (int16)READ_BE_UINT16(ptr);
+	anim.bank = (int16)READ_BE_INT16(ptr);
 	ptr += 2;
 
 	if (anim.bank == 0) {
@@ -514,26 +514,26 @@
 		}
 	}
 
-	anim.mx = (int16)READ_BE_UINT16(ptr);
+	anim.mx = (int16)READ_BE_INT16(ptr);
 	ptr += 2;
 
-	anim.my = (int16)READ_BE_UINT16(ptr);
+	anim.my = (int16)READ_BE_INT16(ptr);
 	ptr += 2;
 
-	anim.cx = (int16)READ_BE_UINT16(ptr);
+	anim.cx = (int16)READ_BE_INT16(ptr);
 	ptr += 2;
 
-	anim.cy = (int16)READ_BE_UINT16(ptr);
+	anim.cy = (int16)READ_BE_INT16(ptr);
 	ptr += 2;
 
-	anim.scale = (int16)READ_BE_UINT16(ptr);
+	anim.scale = (int16)READ_BE_INT16(ptr);
 	ptr += 2;
 
 	if (_vm->resource()->isDemo()) {
 		anim.song = 0;
 	}
 	else {
-		anim.song = (int16)READ_BE_UINT16(ptr);
+		anim.song = (int16)READ_BE_INT16(ptr);
 		ptr += 2;
 	}
 
@@ -575,7 +575,7 @@
 	// Read animation frames
 	for (;;) {
 
-		header = (int16)READ_BE_UINT16(ptr);
+		header = (int16)READ_BE_INT16(ptr);
 		ptr += 2;
 
 		if (-2 == header)
@@ -1007,7 +1007,7 @@
 	byte *ptr = _gameStatePtr;
 
 	// Skipping GAMESTATE data
-	int gameStateCount = (int16)READ_BE_UINT16(ptr); ptr += 2;
+	int gameStateCount = (int16)READ_BE_INT16(ptr); ptr += 2;
 	if (gameStateCount > 0)
 		ptr += (gameStateCount * 12);
 
@@ -1051,16 +1051,16 @@
 			}
 		}
 
-		int quitObjectCount = (int16)READ_BE_UINT16(ptr); ptr += 2;
+		int quitObjectCount = (int16)READ_BE_INT16(ptr); ptr += 2;
 
 		for (i = 0; i < quitObjectCount; i++) {
-			int16 objectIndex  = (int16)READ_BE_UINT16(ptr); ptr += 2;
-			int16 fromIndex    = (int16)READ_BE_UINT16(ptr); ptr += 2;
-			int16 x       = (int16)READ_BE_UINT16(ptr); ptr += 2;
-			int16 y       = (int16)READ_BE_UINT16(ptr); ptr += 2;
-			int16 room    = (int16)READ_BE_UINT16(ptr); ptr += 2;
-			int16 frame   = (int16)READ_BE_UINT16(ptr); ptr += 2;
-			int16 bank    = (int16)READ_BE_UINT16(ptr); ptr += 2;
+			int16 objectIndex  = (int16)READ_BE_INT16(ptr); ptr += 2;
+			int16 fromIndex    = (int16)READ_BE_INT16(ptr); ptr += 2;
+			int16 x       = (int16)READ_BE_INT16(ptr); ptr += 2;
+			int16 y       = (int16)READ_BE_INT16(ptr); ptr += 2;
+			int16 room    = (int16)READ_BE_INT16(ptr); ptr += 2;
+			int16 frame   = (int16)READ_BE_INT16(ptr); ptr += 2;
+			int16 bank    = (int16)READ_BE_INT16(ptr); ptr += 2;
 
 			int bobIndex = _vm->logic()->findBob(objectIndex);
 			ObjectData *object = _vm->logic()->objectData(objectIndex);
@@ -1116,11 +1116,11 @@
 			}
 		} // for()
 		
-		int16 specialMove = (int16)READ_BE_UINT16(ptr); ptr += 2;
+		int16 specialMove = (int16)READ_BE_INT16(ptr); ptr += 2;
 		if (specialMove > 0)
 			_vm->logic()->executeSpecialMove(specialMove);
 
-		_lastSong = (int16)READ_BE_UINT16(ptr); ptr += 2;
+		_lastSong = (int16)READ_BE_INT16(ptr); ptr += 2;
 	}
 
 	if (joeRoom == _temporaryRoom &&
@@ -1141,15 +1141,15 @@
 	// Lines 2047-2115 in cutaway.c
 	byte *ptr = _gameStatePtr;
 
-	int gameStateCount = (int16)READ_BE_UINT16(ptr); ptr += 2;
+	int gameStateCount = (int16)READ_BE_INT16(ptr); ptr += 2;
 
 	for (int i = 0; i < gameStateCount; i++) {
-		int16 stateIndex    = (int16)READ_BE_UINT16(ptr); ptr += 2;
-		int16 stateValue    = (int16)READ_BE_UINT16(ptr); ptr += 2;
-		int16 objectIndex   = (int16)READ_BE_UINT16(ptr); ptr += 2;
-		int16 areaIndex     = (int16)READ_BE_UINT16(ptr); ptr += 2;
-		int16 areaSubIndex  = (int16)READ_BE_UINT16(ptr); ptr += 2;
-		int16 fromObject    = (int16)READ_BE_UINT16(ptr); ptr += 2;
+		int16 stateIndex    = (int16)READ_BE_INT16(ptr); ptr += 2;
+		int16 stateValue    = (int16)READ_BE_INT16(ptr); ptr += 2;
+		int16 objectIndex   = (int16)READ_BE_INT16(ptr); ptr += 2;
+		int16 areaIndex     = (int16)READ_BE_INT16(ptr); ptr += 2;
+		int16 areaSubIndex  = (int16)READ_BE_INT16(ptr); ptr += 2;
+		int16 fromObject    = (int16)READ_BE_INT16(ptr); ptr += 2;
 
 		bool update = false;
 

Index: grid.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/grid.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- grid.cpp	14 Jan 2004 10:40:25 -0000	1.4
+++ grid.cpp	23 Mar 2004 20:34:19 -0000	1.5
@@ -46,8 +46,8 @@
 	_areaMax[0] = 0;
 	memset(&_area[0], 0, sizeof(Area) * MAX_AREAS_NUMBER);
 	for (i = 1; i <= _numRoomAreas; i++) {
-		_objMax[i] = (int16)READ_BE_UINT16(ptr); ptr += 2;
-		_areaMax[i] = (int16)READ_BE_UINT16(ptr); ptr += 2;
+		_objMax[i] = (int16)READ_BE_INT16(ptr); ptr += 2;
+		_areaMax[i] = (int16)READ_BE_INT16(ptr); ptr += 2;
 		memset(&_area[i][0], 0, sizeof(Area));
 		for (j = 1; j <= _areaMax[i]; j++) {
 			assert(j < MAX_AREAS_NUMBER);

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -d -r1.195 -r1.196
--- logic.cpp	18 Mar 2004 21:27:51 -0000	1.195
+++ logic.cpp	23 Mar 2004 20:34:19 -0000	1.196
@@ -1298,11 +1298,11 @@
 void Logic::loadState(uint32 ver, byte *&ptr) {
 	uint16 i;
 	for (i = 0; i < 4; i++) {
-		_inventoryItem[i] = (int16)READ_BE_UINT16(ptr); ptr += 2;
+		_inventoryItem[i] = (int16)READ_BE_INT16(ptr); ptr += 2;
 	}
 
-	_joe.x = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	_joe.y = (int16)READ_BE_UINT16(ptr); ptr += 2;
+	_joe.x = (int16)READ_BE_INT16(ptr); ptr += 2;
+	_joe.y = (int16)READ_BE_INT16(ptr); ptr += 2;
 
 	_currentRoom = READ_BE_UINT16(ptr); ptr += 2;
 
@@ -1313,7 +1313,7 @@
 		_itemData[i].readFromBE(ptr);
 
 	for (i = 0; i < GAME_STATE_COUNT; i++) {
-		_gameState[i] = (int16)READ_BE_UINT16(ptr); ptr += 2;
+		_gameState[i] = (int16)READ_BE_INT16(ptr); ptr += 2;
 	}
 
 	for (i = 0; i < TALK_SELECTED_COUNT; i++)

Index: queen.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- queen.h	15 Jan 2004 21:07:17 -0000	1.29
+++ queen.h	23 Mar 2004 20:34:19 -0000	1.30
@@ -26,6 +26,22 @@
 
 class GameDetector;
 
+#if defined(_WIN32_WCE) && (_WIN32_WCE <= 300)
+
+FORCEINLINE int16 READ_BE_INT16(const void *ptr) {
+	uint16 result;
+	char dummy[2];
+	result = READ_BE_UINT16(ptr);
+	strcpy(dummy, "x"); // Hello, I'm a drunk optimizer. Thanks for helping me.
+	return result;
+}
+
+#else
+
+#define READ_BE_INT16 READ_BE_UINT16
+
+#endif
+
 namespace Queen {
 
 struct GameStateHeader {

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/sound.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- sound.cpp	17 Mar 2004 14:10:51 -0000	1.41
+++ sound.cpp	23 Mar 2004 20:34:19 -0000	1.42
@@ -167,7 +167,7 @@
 }
 
 void Sound::loadState(uint32 ver, byte *&ptr) {
-	_lastOverride = (int16)READ_BE_UINT16(ptr); ptr += 2;
+	_lastOverride = (int16)READ_BE_INT16(ptr); ptr += 2;
 }
 
 void SBSound::playSound(byte *sound, uint32 size, bool isSpeech) {

Index: talk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/talk.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- talk.cpp	19 Mar 2004 10:49:29 -0000	1.95
+++ talk.cpp	23 Mar 2004 20:34:19 -0000	1.96
@@ -300,8 +300,8 @@
 
 	uint8 *ptr = _cutawayPtr;
 
-	int16 cutawayGameState = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	int16 cutawayTestValue = (int16)READ_BE_UINT16(ptr); ptr += 2;
+	int16 cutawayGameState = (int16)READ_BE_INT16(ptr); ptr += 2;
+	int16 cutawayTestValue = (int16)READ_BE_INT16(ptr); ptr += 2;
 
 	if (_vm->logic()->gameState(cutawayGameState) == cutawayTestValue) {
 		getString(ptr, cutawayFilename, 20);
@@ -360,7 +360,7 @@
 
 	for (int i = 1; i <= max; i++) {
 		ptr += 2;
-		int16 currentId = (int16)READ_BE_UINT16(ptr); ptr += 2;
+		int16 currentId = (int16)READ_BE_INT16(ptr); ptr += 2;
 		if (id == currentId) {
 			ptr = getString(ptr, str, MAX_STRING_LENGTH, 4);
 			//debug(6, "Found string with ID %i: '%s'", id, str);
@@ -409,7 +409,7 @@
 	// Load talk header
 	//
 
-	_levelMax = (int16)READ_BE_UINT16(ptr); ptr += 2;
+	_levelMax = (int16)READ_BE_INT16(ptr); ptr += 2;
 
 	//debug(6, "levelMax = %i", _levelMax);
 
@@ -420,15 +420,15 @@
 	else
 		canQuit = true;
 
-	_uniqueKey      = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	_talkKey        = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	_jMax           = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	_pMax           = (int16)READ_BE_UINT16(ptr); ptr += 2;
+	_uniqueKey      = (int16)READ_BE_INT16(ptr); ptr += 2;
+	_talkKey        = (int16)READ_BE_INT16(ptr); ptr += 2;
+	_jMax           = (int16)READ_BE_INT16(ptr); ptr += 2;
+	_pMax           = (int16)READ_BE_INT16(ptr); ptr += 2;
 
 	for (i = 0; i < 2; i++) {
-		_gameState [i] = (int16)READ_BE_UINT16(ptr); ptr += 2;
-		_testValue [i] = (int16)READ_BE_UINT16(ptr); ptr += 2;
-		_itemNumber[i] = (int16)READ_BE_UINT16(ptr); ptr += 2;
+		_gameState [i] = (int16)READ_BE_INT16(ptr); ptr += 2;
+		_testValue [i] = (int16)READ_BE_INT16(ptr); ptr += 2;
+		_itemNumber[i] = (int16)READ_BE_INT16(ptr); ptr += 2;
 	}
 
 	//debug(6, "uniqueKey = %i", _uniqueKey);
@@ -454,13 +454,13 @@
 	for (i = 1; i <= _levelMax; i++)
 		for (int j = 0; j <= 5; j++) {
 			ptr += 2;
-			_dialogueTree[i][j].head = (int16)READ_BE_UINT16(ptr); ptr += 2;
+			_dialogueTree[i][j].head = (int16)READ_BE_INT16(ptr); ptr += 2;
 			ptr += 2;
-			_dialogueTree[i][j].dialogueNodeValue1 = (int16)READ_BE_UINT16(ptr); ptr += 2;
+			_dialogueTree[i][j].dialogueNodeValue1 = (int16)READ_BE_INT16(ptr); ptr += 2;
 			ptr += 2;
-			_dialogueTree[i][j].gameStateIndex = (int16)READ_BE_UINT16(ptr); ptr += 2;
+			_dialogueTree[i][j].gameStateIndex = (int16)READ_BE_INT16(ptr); ptr += 2;
 			ptr += 2;
-			_dialogueTree[i][j].gameStateValue = (int16)READ_BE_UINT16(ptr); ptr += 2;
+			_dialogueTree[i][j].gameStateValue = (int16)READ_BE_INT16(ptr); ptr += 2;
 		}
 }

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24951

Modified Files:
      Tag: branch-0-6-0
	cutaway.cpp grid.cpp logic.cpp queen.h sound.cpp talk.cpp 
Log Message:
Fix #922003 - FOTAQ crash on PocketPC

Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.123.2.2
retrieving revision 1.123.2.3
diff -u -d -r1.123.2.2 -r1.123.2.3
--- cutaway.cpp	7 Mar 2004 10:44:43 -0000	1.123.2.2
+++ cutaway.cpp	23 Mar 2004 20:32:17 -0000	1.123.2.3
@@ -74,9 +74,9 @@
 	_comPanel = READ_BE_UINT16(ptr);
 	ptr += 2;
 	debug(6, "_comPanel = %i", _comPanel);
-
-	_cutawayObjectCount = (int16)READ_BE_UINT16(ptr);
+	_cutawayObjectCount = (int16)READ_BE_INT16(ptr);
 	ptr += 2;
+
 	debug(6, "_cutawayObjectCount = %i", _cutawayObjectCount);
 
 	if (_cutawayObjectCount < 0) {
@@ -86,7 +86,7 @@
 	else
 		_vm->input()->canQuit(true);
 
-	int16 flags1 = (int16)READ_BE_UINT16(ptr);
+	int16 flags1 = (int16)READ_BE_INT16(ptr);
 	ptr += 2;
 	debug(6, "flags1 = %i", flags1);
 
@@ -179,7 +179,7 @@
 	ptr = Talk::getString(ptr, _talkFile, MAX_FILENAME_LENGTH);
 	debug(6, "Talk file = '%s'", _talkFile);
 
-	_talkTo = (int16)READ_BE_UINT16(ptr);
+	_talkTo = (int16)READ_BE_INT16(ptr);
 	ptr += 2;
 	debug(6, "_talkTo = %i", _talkTo);
 }
@@ -188,23 +188,23 @@
 {
 	byte *oldPtr = ptr;
 
-	object.objectNumber  = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	object.moveToX      = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	object.moveToY      = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	object.bank           = (int16)READ_BE_UINT16(ptr); ptr += 2;      
-	object.animList      = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	object.execute        = (int16)READ_BE_UINT16(ptr); ptr += 2;    
-	object.limitBobX1   = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	object.limitBobY1   = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	object.limitBobX2   = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	object.limitBobY2   = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	object.specialMove   = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	object.animType      = (int16)READ_BE_UINT16(ptr); ptr += 2;   
-	object.fromObject    = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	object.bobStartX    = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	object.bobStartY    = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	object.room           = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	object.scale          = (int16)READ_BE_UINT16(ptr); ptr += 2;
+	object.objectNumber  = (int16)READ_BE_INT16(ptr); ptr += 2;
+	object.moveToX      = (int16)READ_BE_INT16(ptr); ptr += 2;
+	object.moveToY      = (int16)READ_BE_INT16(ptr); ptr += 2;
+	object.bank           = (int16)READ_BE_INT16(ptr); ptr += 2;      
+	object.animList      = (int16)READ_BE_INT16(ptr); ptr += 2;
+	object.execute        = (int16)READ_BE_INT16(ptr); ptr += 2;    
+	object.limitBobX1   = (int16)READ_BE_INT16(ptr); ptr += 2;
+	object.limitBobY1   = (int16)READ_BE_INT16(ptr); ptr += 2;
+	object.limitBobX2   = (int16)READ_BE_INT16(ptr); ptr += 2;
+	object.limitBobY2   = (int16)READ_BE_INT16(ptr); ptr += 2;
+	object.specialMove   = (int16)READ_BE_INT16(ptr); ptr += 2;
+	object.animType      = (int16)READ_BE_INT16(ptr); ptr += 2;   
+	object.fromObject    = (int16)READ_BE_INT16(ptr); ptr += 2;
+	object.bobStartX    = (int16)READ_BE_INT16(ptr); ptr += 2;
+	object.bobStartY    = (int16)READ_BE_INT16(ptr); ptr += 2;
+	object.room           = (int16)READ_BE_INT16(ptr); ptr += 2;
+	object.scale          = (int16)READ_BE_INT16(ptr); ptr += 2;
 
 	if ((ptr - oldPtr) != 17*sizeof(int16))
 		error("Wrong number of values read");
@@ -263,14 +263,14 @@
 
 byte *Cutaway::turnOnPeople(byte *ptr, CutawayObject &object) {
 	// Lines 1248-1259 in cutaway.c
-	object.personCount = (int16)READ_BE_UINT16(ptr);
+	object.personCount = (int16)READ_BE_INT16(ptr);
 	ptr += 2;
 
 	if (object.personCount > MAX_PERSON_COUNT)
 		error("[Cutaway::turnOnPeople] object.personCount > MAX_PERSON_COUNT");
 
 	for (int i = 0; i < object.personCount; i++) {
-		object.person[i] = (int16)READ_BE_UINT16(ptr);
+		object.person[i] = (int16)READ_BE_INT16(ptr);
 		ptr += 2;
 		//debug(6, "[%i] Turn on person %i", i, object.person[i]);
 	}
@@ -491,13 +491,13 @@
 		anim.originalFrame = _vm->logic()->findFrame(header);
 	}
 
-	anim.unpackFrame = (int16)READ_BE_UINT16(ptr);
+	anim.unpackFrame = (int16)READ_BE_INT16(ptr);
 	ptr += 2;
 
-	anim.speed = ((int16)READ_BE_UINT16(ptr)) / 3 + 1;
+	anim.speed = ((int16)READ_BE_INT16(ptr)) / 3 + 1;
 	ptr += 2;
 
-	anim.bank = (int16)READ_BE_UINT16(ptr);
+	anim.bank = (int16)READ_BE_INT16(ptr);
 	ptr += 2;
 
 	if (anim.bank == 0) {
@@ -514,26 +514,26 @@
 		}
 	}
 
-	anim.mx = (int16)READ_BE_UINT16(ptr);
+	anim.mx = (int16)READ_BE_INT16(ptr);
 	ptr += 2;
 
-	anim.my = (int16)READ_BE_UINT16(ptr);
+	anim.my = (int16)READ_BE_INT16(ptr);
 	ptr += 2;
 
-	anim.cx = (int16)READ_BE_UINT16(ptr);
+	anim.cx = (int16)READ_BE_INT16(ptr);
 	ptr += 2;
 
-	anim.cy = (int16)READ_BE_UINT16(ptr);
+	anim.cy = (int16)READ_BE_INT16(ptr);
 	ptr += 2;
 
-	anim.scale = (int16)READ_BE_UINT16(ptr);
+	anim.scale = (int16)READ_BE_INT16(ptr);
 	ptr += 2;
 
 	if (_vm->resource()->isDemo()) {
 		anim.song = 0;
 	}
 	else {
-		anim.song = (int16)READ_BE_UINT16(ptr);
+		anim.song = (int16)READ_BE_INT16(ptr);
 		ptr += 2;
 	}
 
@@ -575,7 +575,7 @@
 	// Read animation frames
 	for (;;) {
 
-		header = (int16)READ_BE_UINT16(ptr);
+		header = (int16)READ_BE_INT16(ptr);
 		ptr += 2;
 
 		if (-2 == header)
@@ -1007,7 +1007,7 @@
 	byte *ptr = _gameStatePtr;
 
 	// Skipping GAMESTATE data
-	int gameStateCount = (int16)READ_BE_UINT16(ptr); ptr += 2;
+	int gameStateCount = (int16)READ_BE_INT16(ptr); ptr += 2;
 	if (gameStateCount > 0)
 		ptr += (gameStateCount * 12);
 
@@ -1051,16 +1051,16 @@
 			}
 		}
 
-		int quitObjectCount = (int16)READ_BE_UINT16(ptr); ptr += 2;
+		int quitObjectCount = (int16)READ_BE_INT16(ptr); ptr += 2;
 
 		for (i = 0; i < quitObjectCount; i++) {
-			int16 objectIndex  = (int16)READ_BE_UINT16(ptr); ptr += 2;
-			int16 fromIndex    = (int16)READ_BE_UINT16(ptr); ptr += 2;
-			int16 x       = (int16)READ_BE_UINT16(ptr); ptr += 2;
-			int16 y       = (int16)READ_BE_UINT16(ptr); ptr += 2;
-			int16 room    = (int16)READ_BE_UINT16(ptr); ptr += 2;
-			int16 frame   = (int16)READ_BE_UINT16(ptr); ptr += 2;
-			int16 bank    = (int16)READ_BE_UINT16(ptr); ptr += 2;
+			int16 objectIndex  = (int16)READ_BE_INT16(ptr); ptr += 2;
+			int16 fromIndex    = (int16)READ_BE_INT16(ptr); ptr += 2;
+			int16 x       = (int16)READ_BE_INT16(ptr); ptr += 2;
+			int16 y       = (int16)READ_BE_INT16(ptr); ptr += 2;
+			int16 room    = (int16)READ_BE_INT16(ptr); ptr += 2;
+			int16 frame   = (int16)READ_BE_INT16(ptr); ptr += 2;
+			int16 bank    = (int16)READ_BE_INT16(ptr); ptr += 2;
 
 			int bobIndex = _vm->logic()->findBob(objectIndex);
 			ObjectData *object = _vm->logic()->objectData(objectIndex);
@@ -1116,11 +1116,11 @@
 			}
 		} // for()
 		
-		int16 specialMove = (int16)READ_BE_UINT16(ptr); ptr += 2;
+		int16 specialMove = (int16)READ_BE_INT16(ptr); ptr += 2;
 		if (specialMove > 0)
 			_vm->logic()->executeSpecialMove(specialMove);
 
-		_lastSong = (int16)READ_BE_UINT16(ptr); ptr += 2;
+		_lastSong = (int16)READ_BE_INT16(ptr); ptr += 2;
 	}
 
 	if (joeRoom == _temporaryRoom &&
@@ -1141,15 +1141,15 @@
 	// Lines 2047-2115 in cutaway.c
 	byte *ptr = _gameStatePtr;
 
-	int gameStateCount = (int16)READ_BE_UINT16(ptr); ptr += 2;
+	int gameStateCount = (int16)READ_BE_INT16(ptr); ptr += 2;
 
 	for (int i = 0; i < gameStateCount; i++) {
-		int16 stateIndex    = (int16)READ_BE_UINT16(ptr); ptr += 2;
-		int16 stateValue    = (int16)READ_BE_UINT16(ptr); ptr += 2;
-		int16 objectIndex   = (int16)READ_BE_UINT16(ptr); ptr += 2;
-		int16 areaIndex     = (int16)READ_BE_UINT16(ptr); ptr += 2;
-		int16 areaSubIndex  = (int16)READ_BE_UINT16(ptr); ptr += 2;
-		int16 fromObject    = (int16)READ_BE_UINT16(ptr); ptr += 2;
+		int16 stateIndex    = (int16)READ_BE_INT16(ptr); ptr += 2;
+		int16 stateValue    = (int16)READ_BE_INT16(ptr); ptr += 2;
+		int16 objectIndex   = (int16)READ_BE_INT16(ptr); ptr += 2;
+		int16 areaIndex     = (int16)READ_BE_INT16(ptr); ptr += 2;
+		int16 areaSubIndex  = (int16)READ_BE_INT16(ptr); ptr += 2;
+		int16 fromObject    = (int16)READ_BE_INT16(ptr); ptr += 2;
 
 		bool update = false;
 

Index: grid.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/grid.cpp,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- grid.cpp	14 Jan 2004 10:40:25 -0000	1.4
+++ grid.cpp	23 Mar 2004 20:32:18 -0000	1.4.2.1
@@ -46,8 +46,8 @@
 	_areaMax[0] = 0;
 	memset(&_area[0], 0, sizeof(Area) * MAX_AREAS_NUMBER);
 	for (i = 1; i <= _numRoomAreas; i++) {
-		_objMax[i] = (int16)READ_BE_UINT16(ptr); ptr += 2;
-		_areaMax[i] = (int16)READ_BE_UINT16(ptr); ptr += 2;
+		_objMax[i] = (int16)READ_BE_INT16(ptr); ptr += 2;
+		_areaMax[i] = (int16)READ_BE_INT16(ptr); ptr += 2;
 		memset(&_area[i][0], 0, sizeof(Area));
 		for (j = 1; j <= _areaMax[i]; j++) {
 			assert(j < MAX_AREAS_NUMBER);

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.187.2.6
retrieving revision 1.187.2.7
diff -u -d -r1.187.2.6 -r1.187.2.7
--- logic.cpp	18 Mar 2004 21:27:23 -0000	1.187.2.6
+++ logic.cpp	23 Mar 2004 20:32:18 -0000	1.187.2.7
@@ -1298,11 +1298,11 @@
 void Logic::loadState(uint32 ver, byte *&ptr) {
 	uint16 i;
 	for (i = 0; i < 4; i++) {
-		_inventoryItem[i] = (int16)READ_BE_UINT16(ptr); ptr += 2;
+		_inventoryItem[i] = (int16)READ_BE_INT16(ptr); ptr += 2;
 	}
 
-	_joe.x = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	_joe.y = (int16)READ_BE_UINT16(ptr); ptr += 2;
+	_joe.x = (int16)READ_BE_INT16(ptr); ptr += 2;
+	_joe.y = (int16)READ_BE_INT16(ptr); ptr += 2;
 
 	_currentRoom = READ_BE_UINT16(ptr); ptr += 2;
 
@@ -1313,7 +1313,7 @@
 		_itemData[i].readFromBE(ptr);
 
 	for (i = 0; i < GAME_STATE_COUNT; i++) {
-		_gameState[i] = (int16)READ_BE_UINT16(ptr); ptr += 2;
+		_gameState[i] = (int16)READ_BE_INT16(ptr); ptr += 2;
 	}
 
 	for (i = 0; i < TALK_SELECTED_COUNT; i++)

Index: queen.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.h,v
retrieving revision 1.29
retrieving revision 1.29.2.1
diff -u -d -r1.29 -r1.29.2.1
--- queen.h	15 Jan 2004 21:07:17 -0000	1.29
+++ queen.h	23 Mar 2004 20:32:18 -0000	1.29.2.1
@@ -26,6 +26,22 @@
 
 class GameDetector;
 
+#if defined(_WIN32_WCE) && (_WIN32_WCE <= 300)
+
+FORCEINLINE int16 READ_BE_INT16(const void *ptr) {
+	uint16 result;
+	char dummy[2];
+	result = READ_BE_UINT16(ptr);
+	strcpy(dummy, "x"); // Hello, I'm a drunk optimizer. Thanks for helping me.
+	return result;
+}
+
+#else
+
+#define READ_BE_INT16 READ_BE_UINT16
+
+#endif
+
 namespace Queen {
 
 struct GameStateHeader {

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/sound.cpp,v
retrieving revision 1.35.2.5
retrieving revision 1.35.2.6
diff -u -d -r1.35.2.5 -r1.35.2.6
--- sound.cpp	14 Mar 2004 03:23:03 -0000	1.35.2.5
+++ sound.cpp	23 Mar 2004 20:32:18 -0000	1.35.2.6
@@ -155,7 +155,7 @@
 }
 
 void Sound::loadState(uint32 ver, byte *&ptr) {
-	_lastOverride = (int16)READ_BE_UINT16(ptr); ptr += 2;
+	_lastOverride = (int16)READ_BE_INT16(ptr); ptr += 2;
 }
 
 void SBSound::playSound(byte *sound, uint32 size, bool isSpeech) {

Index: talk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/talk.cpp,v
retrieving revision 1.89.2.2
retrieving revision 1.89.2.3
diff -u -d -r1.89.2.2 -r1.89.2.3
--- talk.cpp	7 Mar 2004 10:44:43 -0000	1.89.2.2
+++ talk.cpp	23 Mar 2004 20:32:18 -0000	1.89.2.3
@@ -296,8 +296,8 @@
 
 	uint8 *ptr = _cutawayPtr;
 
-	int16 cutawayGameState = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	int16 cutawayTestValue = (int16)READ_BE_UINT16(ptr); ptr += 2;
+	int16 cutawayGameState = (int16)READ_BE_INT16(ptr); ptr += 2;
+	int16 cutawayTestValue = (int16)READ_BE_INT16(ptr); ptr += 2;
 
 	if (_vm->logic()->gameState(cutawayGameState) == cutawayTestValue) {
 		getString(ptr, cutawayFilename, 20);
@@ -356,7 +356,7 @@
 
 	for (int i = 1; i <= max; i++) {
 		ptr += 2;
-		int16 currentId = (int16)READ_BE_UINT16(ptr); ptr += 2;
+		int16 currentId = (int16)READ_BE_INT16(ptr); ptr += 2;
 		if (id == currentId) {
 			ptr = getString(ptr, str, MAX_STRING_LENGTH, 4);
 			//debug(6, "Found string with ID %i: '%s'", id, str);
@@ -405,7 +405,7 @@
 	// Load talk header
 	//
 
-	_levelMax = (int16)READ_BE_UINT16(ptr); ptr += 2;
+	_levelMax = (int16)READ_BE_INT16(ptr); ptr += 2;
 
 	//debug(6, "levelMax = %i", _levelMax);
 
@@ -416,15 +416,15 @@
 	else
 		canQuit = true;
 
-	_uniqueKey      = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	_talkKey        = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	_jMax           = (int16)READ_BE_UINT16(ptr); ptr += 2;
-	_pMax           = (int16)READ_BE_UINT16(ptr); ptr += 2;
+	_uniqueKey      = (int16)READ_BE_INT16(ptr); ptr += 2;
+	_talkKey        = (int16)READ_BE_INT16(ptr); ptr += 2;
+	_jMax           = (int16)READ_BE_INT16(ptr); ptr += 2;
+	_pMax           = (int16)READ_BE_INT16(ptr); ptr += 2;
 
 	for (i = 0; i < 2; i++) {
-		_gameState [i] = (int16)READ_BE_UINT16(ptr); ptr += 2;
-		_testValue [i] = (int16)READ_BE_UINT16(ptr); ptr += 2;
-		_itemNumber[i] = (int16)READ_BE_UINT16(ptr); ptr += 2;
+		_gameState [i] = (int16)READ_BE_INT16(ptr); ptr += 2;
+		_testValue [i] = (int16)READ_BE_INT16(ptr); ptr += 2;
+		_itemNumber[i] = (int16)READ_BE_INT16(ptr); ptr += 2;
 	}
 
 	//debug(6, "uniqueKey = %i", _uniqueKey);
@@ -450,13 +450,13 @@
 	for (i = 1; i <= _levelMax; i++)
 		for (int j = 0; j <= 5; j++) {
 			ptr += 2;
-			_dialogueTree[i][j].head = (int16)READ_BE_UINT16(ptr); ptr += 2;
+			_dialogueTree[i][j].head = (int16)READ_BE_INT16(ptr); ptr += 2;
 			ptr += 2;
-			_dialogueTree[i][j].dialogueNodeValue1 = (int16)READ_BE_UINT16(ptr); ptr += 2;
+			_dialogueTree[i][j].dialogueNodeValue1 = (int16)READ_BE_INT16(ptr); ptr += 2;
 			ptr += 2;
-			_dialogueTree[i][j].gameStateIndex = (int16)READ_BE_UINT16(ptr); ptr += 2;
+			_dialogueTree[i][j].gameStateIndex = (int16)READ_BE_INT16(ptr); ptr += 2;
 			ptr += 2;
-			_dialogueTree[i][j].gameStateValue = (int16)READ_BE_UINT16(ptr); ptr += 2;
+			_dialogueTree[i][j].gameStateValue = (int16)READ_BE_INT16(ptr); ptr += 2;
 		}
 }

Update of /cvsroot/scummvm/web/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28415/docs

Modified Files:
	datafiles.xml 
Log Message:

Update


Index: datafiles.xml
===================================================================
RCS file: /cvsroot/scummvm/web/docs/datafiles.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- datafiles.xml	22 Mar 2004 04:58:36 -0000	1.16
+++ datafiles.xml	23 Mar 2004 13:55:11 -0000	1.17
@@ -64,6 +64,7 @@
       DIG.LA1<br>
       DIGMUSIC.BUN<br>
       DIGVOICE.BUN<br>
+      LANGUAGE.BND (Non-English versions)<br>
   </tr>
   <tr>
     <td>Dig, The (Demo)</td>

Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16349

Modified Files:
	actor.cpp costume.cpp costume.h 
Log Message:
Implement animated textures.


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/actor.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- actor.cpp	22 Mar 2004 12:46:38 -0000	1.22
+++ actor.cpp	23 Mar 2004 13:05:08 -0000	1.23
@@ -245,6 +245,10 @@
 }
 
 void Actor::draw() {
+	for (std::list<Costume *>::iterator i = costumeStack_.begin();
+	     i != costumeStack_.end(); i++)
+		(*i)->setupTextures();
+
 	if (! costumeStack_.empty()) {
 		g_driver->startActorDraw(pos_, yaw_, pitch_, roll_);
 		costumeStack_.back()->draw();

Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/costume.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- costume.cpp	23 Mar 2004 10:38:02 -0000	1.14
+++ costume.cpp	23 Mar 2004 13:05:08 -0000	1.15
@@ -22,6 +22,7 @@
 #include "engine.h"
 #include "colormap.h"
 #include "keyframe.h"
+#include "material.h"
 #include "model.h"
 #include "lua.h"
 #include "sound.h"
@@ -62,6 +63,10 @@
 //                given by a playing chore
 // update() -- gives the component a chance to update its internal
 //             state once every frame
+// setupTexture() -- sets up animated textures for the object.  This
+//                   is a separate stage from update() since all the
+//                   costumes on screen need to get updated before any
+//                   drawing can start.
 // draw() -- actually draws the component onto the screen
 // reset() -- notifies the component that a chore controlling it
 //            has stopped
@@ -412,6 +417,50 @@
 	node_->update();
 }
 
+class MaterialComponent : public Costume::Component {
+public:
+	MaterialComponent(Costume::Component *parent, int parentID,
+			  const char *filename);
+	void init();
+	void setKey(int val);
+	void setupTexture();
+	void reset();
+	~MaterialComponent() { }
+
+private:
+	ResPtr<Material> mat_;
+	std::string filename_;
+	int num_;
+};
+
+MaterialComponent::MaterialComponent(Costume::Component *parent, int parentID,
+				     const char *filename) :
+	Costume::Component(parent, parentID), filename_(filename), num_(0) {
+	warning("Constructing MaterialComponent %s\n", filename);
+}
+
+void MaterialComponent::init() {
+	warning("MaterialComponent::init on %s\n", filename_.c_str());
+	// The parent model and thus all its textures should have been
+	// loaded by now, so passing an arbitrary colormap here
+	// shouldn't cause problems.
+	ResPtr<CMap> cmap =
+		ResourceLoader::instance()->loadColormap("item.cmp");
+	mat_ = ResourceLoader::instance()->loadMaterial(filename_.c_str(), *cmap);
+}
+
+void MaterialComponent::setKey(int val) {
+	num_ = val;
+}
+
+void MaterialComponent::setupTexture() {
+	mat_->setNumber(num_);
+}
+
+void MaterialComponent::reset() {
+	num_ = 0;
+}
+
 class LuaVarComponent : public Costume::Component {
 public:
 	LuaVarComponent(Costume::Component *parent, int parentID,
@@ -661,7 +710,8 @@
 		return new SoundComponent(parent, parentID, name);
 	else if (std::memcmp(tag, "bknd", 4) == 0)
 		return new BitmapComponent(parent, parentID, name);
-
+	else if (std::memcmp(tag, "mat ", 4) == 0)
+		return new MaterialComponent(parent, parentID, name);
 	warning("Unknown tag '%.4s', name '%s'\n", tag, name);
 	return NULL;
 }
@@ -712,6 +762,12 @@
 	talkChores_[index-1] = chore;
 }
 
+void Costume::setupTextures() {
+	for (int i = 0; i < numComponents_; i++)
+		if (components_[i] != NULL)
+			components_[i]->setupTexture();
+}
+
 void Costume::draw() {
 	for (int i = 0; i < numComponents_; i++)
 		if (components_[i] != NULL)

Index: costume.h
===================================================================
RCS file: /cvsroot/scummvm/residual/costume.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- costume.h	24 Feb 2004 21:09:53 -0000	1.7
+++ costume.h	23 Mar 2004 13:05:08 -0000	1.8
@@ -48,6 +48,7 @@
 	void setHead( int joint1, int joint2, int joint3, float maxRoll, float maxPitch, float maxYaw );
 
 	void update();
+	void setupTextures();
 	void draw();
 	void setPosRotate( Vector3d pos_, float pitch_, float yaw_, float roll_ );
 
@@ -59,6 +60,7 @@
 		virtual void init() { }
 		virtual void setKey(int /* val */) { }
 		virtual void update() { }
+		virtual void setupTexture() { }
 		virtual void draw() { }
 		virtual void reset() { }
 		virtual ~Component() { }

Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27407

Modified Files:
	scene.cpp 
Log Message:
Read all sectors, including sector 0.  This fixes the elevator to
the garage.


Index: scene.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/scene.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- scene.cpp	23 Mar 2004 10:38:02 -0000	1.21
+++ scene.cpp	23 Mar 2004 11:22:22 -0000	1.22
@@ -77,6 +77,7 @@
 	}
 
 	ts.scanString(" id %d", 1, &numSectors_);
+	numSectors_++;
 	sectors_ = new Sector[numSectors_];
 	// FIXME: This would be nicer if we could rewind the textsplitter
 	// stream

Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18241

Modified Files:
	TODO bitmap.cpp costume.cpp driver_gl.cpp driver_gl.h lua.cpp 
	objectstate.cpp objectstate.h scene.cpp scene.h 
Log Message:
Implement animated bitmaps.

Reorganize ZBuffer rendering code a bit.


Index: TODO
===================================================================
RCS file: /cvsroot/scummvm/residual/TODO,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- TODO	22 Mar 2004 11:23:36 -0000	1.31
+++ TODO	23 Mar 2004 10:38:02 -0000	1.32
@@ -2,7 +2,7 @@
 ------------------------------------------------
 Assigned tasks:
  * Add LAF font and text drawing support (aquadran)
- * Implement drawing 2D objects (frob)
+ * Implement FadeInChore and FadeOutChore (frob)
 
 Unassigned (help wanted):
  * Add OpenGL lighting (ender, possibly)

Index: bitmap.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/bitmap.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- bitmap.cpp	22 Mar 2004 21:48:30 -0000	1.20
+++ bitmap.cpp	23 Mar 2004 10:38:02 -0000	1.21
@@ -41,7 +41,7 @@
 	format_ = READ_LE_UINT32(data + 32);
 	width_ = READ_LE_UINT32(data + 128);
 	height_ = READ_LE_UINT32(data + 132);
-	curr_image_ = 0;
+	curr_image_ = 1;
 
 	data_ = new char*[num_images_];
 	int pos = 0x88;
@@ -65,76 +65,98 @@
 	
 	if (format_ == 1) {
 		hasTransparency_ = false;
+		num_tex_ = ((width_ + (BITMAP_TEXTURE_SIZE - 1)) / BITMAP_TEXTURE_SIZE) *
+			((height_ + (BITMAP_TEXTURE_SIZE - 1)) / BITMAP_TEXTURE_SIZE);
+		tex_ids_ = new GLuint[num_tex_ * num_images_];
+		glGenTextures(num_tex_ * num_images_, tex_ids_);
 
-		// Convert data to 32-bit RGBA format
 		char *texData = new char[4 * width_ * height_];
-		char *texDataPtr = texData;
-		uint16 *bitmapData = reinterpret_cast<uint16 *>(data_[0]);
-		for (int i = 0; i < width_ * height_;
-		     i++, texDataPtr += 4, bitmapData++) {
-			uint16 pixel = *bitmapData;
-			int r = pixel >> 11;
-			texDataPtr[0] = (r << 3) | (r >> 2);
-			int g = (pixel >> 5) & 0x3f;
-			texDataPtr[1] = (g << 2) | (g >> 4);
-			int b = pixel & 0x1f;
-			texDataPtr[2] = (b << 3) | (b >> 2);
-			if (pixel == 0xf81f) { // transparent
-				texDataPtr[3] = 0;
-				hasTransparency_ = true;
+
+		for (int pic = 0; pic < num_images_; pic++) {
+			// Convert data to 32-bit RGBA format
+			char *texDataPtr = texData;
+			uint16 *bitmapData = reinterpret_cast<uint16 *>(data_[pic]);
+			for (int i = 0; i < width_ * height_;
+			     i++, texDataPtr += 4, bitmapData++) {
+				uint16 pixel = *bitmapData;
+				int r = pixel >> 11;
+				texDataPtr[0] = (r << 3) | (r >> 2);
+				int g = (pixel >> 5) & 0x3f;
+				texDataPtr[1] = (g << 2) | (g >> 4);
+				int b = pixel & 0x1f;
+				texDataPtr[2] = (b << 3) | (b >> 2);
+				if (pixel == 0xf81f) { // transparent
+					texDataPtr[3] = 0;
+					hasTransparency_ = true;
+				}
+				else
+					texDataPtr[3] = 255;
 			}
-			else
-				texDataPtr[3] = 255;
-		}
 
-		num_tex_ = ((width_ + (BITMAP_TEXTURE_SIZE - 1)) / BITMAP_TEXTURE_SIZE) *
-			((height_ + (BITMAP_TEXTURE_SIZE - 1)) / BITMAP_TEXTURE_SIZE);
-		tex_ids_ = new GLuint[num_tex_];
-		glGenTextures(num_tex_, tex_ids_);
-		for (int i = 0; i < num_tex_; i++) {
-			glBindTexture(GL_TEXTURE_2D, tex_ids_[i]);
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
-			glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
-				BITMAP_TEXTURE_SIZE, BITMAP_TEXTURE_SIZE, 0,
-				GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-		}
+			for (int i = 0; i < num_tex_; i++) {
+				glBindTexture(GL_TEXTURE_2D, tex_ids_[num_tex_ * pic + i]);
+				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
+				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+				glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
+					     BITMAP_TEXTURE_SIZE, BITMAP_TEXTURE_SIZE, 0,
+					     GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+			}
 
-		glPixelStorei(GL_UNPACK_ALIGNMENT, 2);
-		glPixelStorei(GL_UNPACK_ROW_LENGTH, width_);
+			glPixelStorei(GL_UNPACK_ALIGNMENT, 2);
+			glPixelStorei(GL_UNPACK_ROW_LENGTH, width_);
 
-		int cur_tex_idx = 0;
-		for (int y = 0; y < height_; y += BITMAP_TEXTURE_SIZE) {
-			for (int x = 0; x < width_; x += BITMAP_TEXTURE_SIZE) {
-				int width  = (x + BITMAP_TEXTURE_SIZE >= width_)  ? (width_  - x) : BITMAP_TEXTURE_SIZE;
-				int height = (y + BITMAP_TEXTURE_SIZE >= height_) ? (height_ - y) : BITMAP_TEXTURE_SIZE;
-				glBindTexture(GL_TEXTURE_2D, tex_ids_[cur_tex_idx]);
-				glTexSubImage2D(GL_TEXTURE_2D,
-					0,
-					0, 0,
-					width, height,
-					GL_RGBA,
-					GL_UNSIGNED_BYTE,
-					texData + (y * 4 * width_) + (4 * x));
-				cur_tex_idx++;
+			int cur_tex_idx = num_tex_ * pic;
+
+			for (int y = 0; y < height_; y += BITMAP_TEXTURE_SIZE) {
+				for (int x = 0; x < width_; x += BITMAP_TEXTURE_SIZE) {
+					int width  = (x + BITMAP_TEXTURE_SIZE >= width_)  ? (width_  - x) : BITMAP_TEXTURE_SIZE;
+					int height = (y + BITMAP_TEXTURE_SIZE >= height_) ? (height_ - y) : BITMAP_TEXTURE_SIZE;
+					glBindTexture(GL_TEXTURE_2D, tex_ids_[cur_tex_idx]);
+					glTexSubImage2D(GL_TEXTURE_2D,
+							0,
+							0, 0,
+							width, height,
+							GL_RGBA,
+							GL_UNSIGNED_BYTE,
+							texData + (y * 4 * width_) + (4 * x));
+					cur_tex_idx++;
+				}
 			}
 		}
+
 		glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
 		glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
 		delete [] texData;
 	} else {
-		for (int i = 0; i < (width_ * height_); i++) {
-			uint16 val = READ_LE_UINT16(data_[curr_image_] + 2 * i);
-			((uint16 *) data_[curr_image_])[i] =
-				0xffff - ((uint32) val) * 0x10000 / 100 / (0x10000 - val);
+		for (int pic = 0; pic < num_images_; pic++) {
+			uint16 *zbufPtr = reinterpret_cast<uint16*>(data_[pic]);
+			for (int i = 0; i < (width_ * height_); i++) {
+				uint16 val = READ_LE_UINT16(data_[pic] + 2 * i);
+				zbufPtr[i] = 0xffff - ((uint32) val) * 0x10000 / 100 / (0x10000 - val);
+			}
+
+			// Flip the zbuffer image to match what GL expects
+			for (int y = 0; y < height_ / 2; y++) {
+				uint16 *ptr1 = zbufPtr + y * width_;
+				uint16 *ptr2 = zbufPtr + (height_ - 1 - y) * width_;
+				for (int x = 0; x < width_; x++, ptr1++, ptr2++) {
+					uint16 tmp = *ptr1;
+					*ptr1 = *ptr2;
+					*ptr2 = tmp;
+				}
+			}
 		}
+
 		tex_ids_ = NULL;
 	}
 }
 
 void Bitmap::draw() const {
+	if (curr_image_ == 0)
+		return;
+
 	glMatrixMode(GL_PROJECTION);
 	glLoadIdentity();
 	glOrtho(0, 640, 480, 0, 0, 1);
@@ -153,18 +175,13 @@
 	glDisable(GL_LIGHTING);
 	glEnable(GL_TEXTURE_2D);
 	if (format_ == 1) {		// Normal image
-		if (curr_image_ != 0) {
-			warning("Animation not handled yet in GL texture path !\n");
-		}
 		glDisable(GL_DEPTH_TEST);
 		glDepthMask(GL_FALSE);
 		glEnable(GL_SCISSOR_TEST);
 		glScissor(x_, 480 - (y_ + height_), width_, height_);
-		int cur_tex_idx = 0;
+		int cur_tex_idx = num_tex_ * (curr_image_ - 1);
 		for (int y = y_; y < (y_ + height_); y += BITMAP_TEXTURE_SIZE) {
 			for (int x = x_; x < (x_ + width_); x += BITMAP_TEXTURE_SIZE) {
-				int width  = (x + BITMAP_TEXTURE_SIZE >= (x_ + width_))  ? ((x_ + width_)  - x) : BITMAP_TEXTURE_SIZE;
-				int height = (y + BITMAP_TEXTURE_SIZE >= (y_ + height_)) ? ((y_ + height_) - y) : BITMAP_TEXTURE_SIZE;
 				glBindTexture(GL_TEXTURE_2D, tex_ids_[cur_tex_idx]);
 				glBegin(GL_QUADS);
 				glTexCoord2f(0.0, 0.0);
@@ -190,7 +207,7 @@
 		if ((ZBUFFER_GLOBAL == 0) || (SCREENBLOCKS_GLOBAL == 1))
 			return;
 
-		g_driver->drawDepthBitmap(curr_image_, x_, y_, width_, height_, data_);
+		g_driver->drawDepthBitmap(x_, y_, width_, height_, data_[curr_image_ - 1]);
 	}
 }
 
@@ -199,7 +216,7 @@
 		delete[] data_[i];
 	delete[] data_;
 	if (tex_ids_) {
-		glDeleteTextures(num_tex_, tex_ids_);
+		glDeleteTextures(num_tex_ * num_images_, tex_ids_);
 		delete[] tex_ids_;
 	}
 }

Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/costume.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- costume.cpp	22 Mar 2004 11:23:36 -0000	1.13
+++ costume.cpp	23 Mar 2004 10:38:02 -0000	1.14
@@ -91,8 +91,6 @@
 
 private:
 	std::string filename_;
-	std::string zbuf_filename_;
-	ResPtr<Bitmap> bitmap_;
 };
 
 class ModelComponent : public Costume::Component {
@@ -154,13 +152,16 @@
 BitmapComponent::BitmapComponent(Costume::Component *parent, int parentID,
 								const char *filename) :
 		Costume::Component(parent, parentID), filename_(filename) {
-
-	bitmap_ = ResourceLoader::instance()->loadBitmap(filename);
-	warning("Instanced BitmapComponenet from Costume renderer with filename %s: NOT IMPLEMENTED YET", filename);
 }
 
 void BitmapComponent::setKey(int val) {
-	//	bitmap_->setNumber(val);
+	ObjectState *state =
+		Engine::instance()->currScene()->findState(filename_.c_str());
+	if (state != NULL)
+		state->setNumber(val);
+	else
+		warning("Couldn't find bitmap %s in current scene\n",
+			filename_.c_str());
 }
 
 ModelComponent::ModelComponent(Costume::Component *parent, int parentID,

Index: driver_gl.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/driver_gl.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- driver_gl.cpp	20 Mar 2004 07:45:34 -0000	1.8
+++ driver_gl.cpp	23 Mar 2004 10:38:02 -0000	1.9
@@ -123,24 +123,26 @@
 	glPopMatrix();
 }
 
-void Driver::drawDepthBitmap(int num, int x, int y, int w, int h, char **data) {
-	if (num != 0) {
-		warning("Animation not handled yet in GL texture path !\n");
-	}
+void Driver::drawDepthBitmap(int x, int y, int w, int h, char *data) {
+	//	if (num != 0) {
+	//		warning("Animation not handled yet in GL texture path !\n");
+	//	}
 
-	glRasterPos2i(x, y);
+	if (y + h == 480) {
+		glRasterPos2i(x, 479);
+		glBitmap(0, 0, 0, 0, 0, -1, NULL);
+	}
+	else
+		glRasterPos2i(x, y + h);
 	glEnable(GL_DEPTH_TEST);
 	glDepthFunc(GL_ALWAYS);
 	glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
 	glDepthMask(GL_TRUE);
 
-	// This loop here is to prevent using PixelZoom that may be unoptimized for the 1.0 / -1.0 case
-	// in some drivers...
+	glPixelStorei(GL_UNPACK_ALIGNMENT, 2);
+	glDrawPixels(w, h, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, data);
+	glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
 
-	for (int row = 0; row < h; row++) {
-		glRasterPos2i(x, y + row + 1);
-		//glDrawPixels(w, 1, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, data[num] + (2 * row * w));
-	}
 	glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
 	glDepthFunc(GL_LESS);
 }

Index: driver_gl.h
===================================================================
RCS file: /cvsroot/scummvm/residual/driver_gl.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- driver_gl.h	29 Feb 2004 18:38:26 -0000	1.5
+++ driver_gl.h	23 Mar 2004 10:38:02 -0000	1.6
@@ -39,7 +39,7 @@
 		void startActorDraw(Vector3d pos, float yaw, float pitch, float roll);
 		void finishActorDraw();
 
-		void drawDepthBitmap(int num, int x, int y, int w, int h, char **data);
+		void drawDepthBitmap(int x, int y, int w, int h, char *data);
 		void drawBitmap();
 
 		void drawHackFont(int x, int y, const char *text, Color &fgColor);

Index: lua.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/lua.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- lua.cpp	22 Mar 2004 12:46:38 -0000	1.49
+++ lua.cpp	23 Mar 2004 10:38:02 -0000	1.50
@@ -1095,18 +1095,12 @@
 	ObjectState::Position pos = check_objstate_pos(2); // When to draw
 	char *bitmap = luaL_check_string(3);	// Bitmap
 	char *zbitmap = NULL;			// Zbuffer Bitmap
-	bool unk1 = getbool(5);			// ?
-	bool unk2 = getbool(6);
+	bool visible = getbool(5);		// Starts visible?
 
 	if (!lua_isnil(lua_getparam(4)))
 		zbitmap = luaL_check_string(4);
 
-#ifndef OSX
-	warning("Stub: newObjectState(%d, %d, %s, %s)", setupID, pos, bitmap, zbitmap);
-#endif
-
-	object = new ObjectState(setupID, pos, bitmap, zbitmap,
-				 unk1, unk2);
+	object = new ObjectState(setupID, pos, bitmap, zbitmap, visible);
 	Engine::instance()->currScene()->addObjectState(object);
 	lua_pushusertag(object, object_tag);
 }

Index: objectstate.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/objectstate.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- objectstate.cpp	22 Mar 2004 11:24:01 -0000	1.1
+++ objectstate.cpp	23 Mar 2004 10:38:02 -0000	1.2
@@ -2,9 +2,16 @@
 
 ObjectState::ObjectState(int setupID, ObjectState::Position pos,
 			 const char *bitmap, const char *zbitmap,
-			 bool unk1, bool unk2) :
-	setupID_(setupID), pos_(pos), unk1_(unk1), unk2_(unk2) {
+			 bool visible) :
+	setupID_(setupID), pos_(pos) {
 	bitmap_ = ResourceLoader::instance()->loadBitmap(bitmap);
 	if (zbitmap)
 		zbitmap_ = ResourceLoader::instance()->loadBitmap(zbitmap);
+
+	int initialImage = 0;
+	if (visible)
+		initialImage = 1;
+	bitmap_->setNumber(initialImage);
+	if (zbitmap_)
+		zbitmap_->setNumber(initialImage);
 }

Index: objectstate.h
===================================================================
RCS file: /cvsroot/scummvm/residual/objectstate.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- objectstate.h	23 Mar 2004 00:06:31 -0000	1.4
+++ objectstate.h	23 Mar 2004 10:38:02 -0000	1.5
@@ -18,7 +18,7 @@
 
 	ObjectState(int setupID, ObjectState::Position pos,
 		    const char *bitmap, const char *zbitmap,
-		    bool unk1, bool unk2);
+		    bool visible);
 
 	int setupID() const { return setupID_; }
 	Position pos() const { return pos_; }
@@ -26,6 +26,11 @@
 		return bitmap_->filename();
 	}
 
+	void setNumber(int val) {
+		bitmap_->setNumber(val);
+		if (zbitmap_)
+			zbitmap_->setNumber(val);
+	}
 	void draw() {
 		bitmap_->draw();
 		if (zbitmap_)
@@ -36,7 +41,6 @@
 	int setupID_;
 	Position pos_;
 	ResPtr<Bitmap> bitmap_, zbitmap_;
-	bool unk1_, unk2_;
 };
 
 

Index: scene.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/scene.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- scene.cpp	22 Mar 2004 11:23:37 -0000	1.20
+++ scene.cpp	23 Mar 2004 10:38:02 -0000	1.21
@@ -169,3 +169,12 @@
 			(*i)->draw();
 	}
 }
+
+ObjectState *Scene::findState(const char *filename) {
+	for (StateList::iterator i = states_.begin(); i != states_.end();
+	     i++) {
+		if (strcmp((*i)->bitmapFilename(), filename) == 0)
+			return *i;
+	}
+	return NULL;
+}

Index: scene.h
===================================================================
RCS file: /cvsroot/scummvm/residual/scene.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- scene.h	22 Mar 2004 11:23:37 -0000	1.14
+++ scene.h	23 Mar 2004 10:38:02 -0000	1.15
@@ -70,6 +70,7 @@
 	void addObjectState(ObjectState *s) {
 		states_.push_back(s);
 	}
+	ObjectState *findState(const char *filename);
 
 private:
 	struct Setup {		// Camera setup data

Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31441

Modified Files:
	Makefile.mingw 
Log Message:

Update


Index: Makefile.mingw
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile.mingw,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Makefile.mingw	5 Mar 2004 03:18:51 -0000	1.18
+++ Makefile.mingw	23 Mar 2004 05:49:51 -0000	1.19
@@ -14,7 +14,7 @@
 	textsplit.o lua.o registry.o localize.o scene.o engine.o actor.o \
 	sound.o timer.o keyframe.o costume.o walkplane.o textobject.o \
 	matrix3.o matrix4.o screen.o blocky16.o smush.o vima.o driver_gl.o \
-	mixer/mixer.o mixer/rate.o mixer/audiostream.o
+	objectstate.o mixer/mixer.o mixer/rate.o mixer/audiostream.o
 DEPS = $(OBJS:.o=.d)
 EXEEXT =.exe

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8731/scumm

Modified Files:
	scumm.cpp 
Log Message:

Move HE games together.


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- scumm.cpp	23 Mar 2004 01:59:02 -0000	1.7
+++ scumm.cpp	23 Mar 2004 03:33:23 -0000	1.8
@@ -154,23 +154,6 @@
 	 GF_USE_KEY, 0},
 
 	/* Scumm Version 6 */
-	{"puttputt", "Putt-Putt Joins The Parade", GID_PUTTPUTT, 6, MDT_ADLIB | MDT_NATIVE,
-	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	{"puttdemo", "Putt-Putt Joins The Parade (Demo)", GID_PUTTDEMO, 6, MDT_ADLIB | MDT_NATIVE,
-	  GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS, 0},
-	{"moondemo", "Putt-Putt Goes To The Moon (Demo)", GID_PUTTMOON, 6, MDT_ADLIB | MDT_NATIVE,
-	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	{"puttmoon", "Putt-Putt Goes To The Moon", GID_PUTTMOON, 6, MDT_ADLIB | MDT_NATIVE,
-	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	{"funpack", "Putt-Putt's Fun Pack", GID_PUTTMOON, 6, MDT_ADLIB | MDT_NATIVE,
-	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	{"fbpack", "Fatty Bear's Fun Pack", GID_FBPACK, 6, MDT_ADLIB | MDT_NATIVE,
-	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	{"fbear", "Fatty Bear's Birthday Surprise", GID_FBEAR, 6, MDT_ADLIB | MDT_NATIVE,
-	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	{"fbdemo", "Fatty Bear's Birthday Surprise (Demo)", GID_FBEAR, 6, MDT_ADLIB | MDT_NATIVE,
-	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-
 	{"tentacle", "Day Of The Tentacle", GID_TENTACLE, 6, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE,
 	 GF_NEW_OPCODES | GF_USE_KEY, 0},
 	{"dottdemo", "Day Of The Tentacle (Demo)", GID_TENTACLE, 6, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE,
@@ -209,10 +192,28 @@
 	 GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_DEFAULT_TO_1X_SCALER | GF_DEMO, "comi"},
 #endif
 
+	// Humongous Entertainment Scumm Version 6
+	{"puttputt", "Putt-Putt Joins The Parade", GID_PUTTPUTT, 6, MDT_ADLIB | MDT_NATIVE,
+	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"puttdemo", "Putt-Putt Joins The Parade (Demo)", GID_PUTTDEMO, 6, MDT_ADLIB | MDT_NATIVE,
+	  GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS, 0},
+	{"moondemo", "Putt-Putt Goes To The Moon (Demo)", GID_PUTTMOON, 6, MDT_ADLIB | MDT_NATIVE,
+	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"puttmoon", "Putt-Putt Goes To The Moon", GID_PUTTMOON, 6, MDT_ADLIB | MDT_NATIVE,
+	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"funpack", "Putt-Putt's Fun Pack", GID_PUTTMOON, 6, MDT_ADLIB | MDT_NATIVE,
+	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"fbpack", "Fatty Bear's Fun Pack", GID_FBPACK, 6, MDT_ADLIB | MDT_NATIVE,
+	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"fbear", "Fatty Bear's Birthday Surprise", GID_FBEAR, 6, MDT_ADLIB | MDT_NATIVE,
+	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"fbdemo", "Fatty Bear's Birthday Surprise (Demo)", GID_FBEAR, 6, MDT_ADLIB | MDT_NATIVE,
+	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+
 #ifdef HEGAMES
 	 /* Note that both full versions of Humongous games and demos were often released for
 	  * several interpreter versions... */
-	// Humongous Entertainment Scumm Version 7 
+	// Humongous Entertainment Scumm Version 7
 	{"catalog", "Humongous Interactive Catalog", GID_PUTTPUTT, 6, MDT_NONE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
 	{"farm", "Let's Explore the Farm with Buzzy", GID_PUTTPUTT, 6, MDT_NONE,
@@ -227,6 +228,8 @@
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
 	{"puttzoo", "Putt-Putt Saves the Zoo", GID_PUTTPUTT, 6, MDT_NONE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"freddi", "Freddi Fish 1: The Case of the Missing Kelp Seeds", GID_FREDDI, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_DEFAULT_TO_1X_SCALER, 0},
 
 	// Humongous Entertainment Scumm Version 8.0 ?  Scummsrc.80 
 	{"zoodemo", "Putt-Putt Saves the Zoo (Demo)", GID_PJSDEMO, 6, MDT_NONE,
@@ -258,8 +261,6 @@
 	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
 	{"1grademo", "Big Thinkers First Grade (Demo)", GID_PJSDEMO, 6, MDT_NONE,
 	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	{"freddi", "Freddi Fish 1: The Case of the Missing Kelp Seeds", GID_FREDDI, 6, MDT_NONE,
-	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_DEFAULT_TO_1X_SCALER, 0},
 	{"f3-mdemo", "Freddi Fish 3: The Case of the Stolen Conch Shell (Demo)", GID_PJSDEMO, 6, MDT_NONE,
 	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
 	{"timedemo", "Putt-Putt Travels Through Time (Demo)", GID_PJSDEMO, 6, MDT_NONE,
@@ -672,7 +673,7 @@
 	if (_features & GF_FMTOWNS) {	// FMTowns V3 games use 320x240
 		_screenWidth = 320;
 		_screenHeight = 240;
-	} else if ((_gameId == GID_CMI) || (_features & GF_AFTER_HEV7)) {
+	} else if (_features & GF_DEFAULT_TO_1X_SCALER) {
 		_screenWidth = 640;
 		_screenHeight = 480;
 	} else if (_features & GF_NES) {

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24934/scumm

Modified Files:
	resource.cpp scumm.cpp scumm.h 
Log Message:

Alter some HE games settings


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -d -r1.194 -r1.195
--- resource.cpp	17 Mar 2004 01:50:14 -0000	1.194
+++ resource.cpp	23 Mar 2004 01:59:02 -0000	1.195
@@ -2047,7 +2047,7 @@
 			_numGlobalScripts = 2000;
 
 		_shadowPaletteSize = NUM_SHADOW_PALETTE * 256;
-	} else if (_features & GF_HE7_RESOURCES) {
+	} else if (_features & GF_AFTER_HEV7) {
 		_fileHandle.readUint16LE();
 		_numVariables = _fileHandle.readUint16LE();
 		_numBitVariables = _fileHandle.readUint16LE();
@@ -2072,7 +2072,7 @@
 		_objectRoomTable = (byte *)calloc(_numGlobalObjects * 4, 1);
 		_numGlobalScripts = 200;
 		_shadowPaletteSize = 256;
-	} else if (_version == 6 && _gameId != GID_PJSDEMO) {
+	} else if (_version == 6) {
 		_numVariables = _fileHandle.readUint16LE();
 		_fileHandle.readUint16LE();                      // 16 in Sam/DOTT
 		_numBitVariables = _fileHandle.readUint16LE();

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- scumm.cpp	19 Mar 2004 17:58:47 -0000	1.6
+++ scumm.cpp	23 Mar 2004 01:59:02 -0000	1.7
@@ -207,112 +207,116 @@
 	 GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_DEFAULT_TO_1X_SCALER, 0},
 	{"comidemo", "The Curse of Monkey Island (Demo)", GID_CMI, 8, MDT_NONE,
 	 GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_DEFAULT_TO_1X_SCALER | GF_DEMO, "comi"},
+#endif
 
+#ifdef HEGAMES
 	 /* Note that both full versions of Humongous games and demos were often released for
 	  * several interpreter versions... */
 	// Humongous Entertainment Scumm Version 7 
-	//{"catalog", "Humongous Interactive Catalog", GID_PUTTPUTT, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	//{"farm", "Let's Explore the Farm with Buzzy", GID_PUTTPUTT, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	//{"farmdemo", "Let's Explore the Farm with Buzzy (Demo)", GID_PUTTPUTT, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	//{"airport", "Let's Explore the Airport with Buzzy", GID_PUTTPUTT, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	//{"airdemo", "Let's Explore the Airport with Buzzy (Demo)", GID_PUTTPUTT, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	//{"jungle", "Let's Explore the Jungle with Buzzy", GID_PUTTPUTT, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	//{"puttzoo", "Putt-Putt Saves the Zoo", GID_PUTTPUTT, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	{"freddemo", "Freddi Fish 1: The Case of the Missing Kelp Seeds (Demo)", GID_FREDDEMO, 6, MDT_NONE,
-	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_HE7_RESOURCES | GF_DEFAULT_TO_1X_SCALER, 0},
-	{"zoodemo", "Putt-Putt Saves the Zoo (Demo)", GID_PJSDEMO, 6, MDT_NONE,
-	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_HE7_RESOURCES | GF_DEFAULT_TO_1X_SCALER, 0},
-
+	{"catalog", "Humongous Interactive Catalog", GID_PUTTPUTT, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"farm", "Let's Explore the Farm with Buzzy", GID_PUTTPUTT, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"farmdemo", "Let's Explore the Farm with Buzzy (Demo)", GID_PUTTPUTT, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"airport", "Let's Explore the Airport with Buzzy", GID_PUTTPUTT, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"airdemo", "Let's Explore the Airport with Buzzy (Demo)", GID_PUTTPUTT, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"jungle", "Let's Explore the Jungle with Buzzy", GID_PUTTPUTT, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"puttzoo", "Putt-Putt Saves the Zoo", GID_PUTTPUTT, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
 
 	// Humongous Entertainment Scumm Version 8.0 ?  Scummsrc.80 
-	//{"ffhsdemo", "Freddi Fish 2: The Case of the Haunted Schoolhouse (Demo)", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	//{"ff2-demo", "Freddi Fish 2: The Case of the Haunted Schoolhouse (Demo)", GID_PJSDEMO, 6, MDT_NONE,
-	//GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_HE7_RESOURCES | GF_DEFAULT_TO_1X_SCALER, 0},
-	//{"freddi2", "Freddi Fish 2: The Case of the Haunted Schoolhouse", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	//{"maze", "Freddi Fish and Luther's Maze Madness", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	//{"water", "Freddi Fish and Luther's Water Worries", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	//{"pajama", "Pajama Sam 1: No Need to Hide When It's Dark Outside", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	//{"pjs-demo", "Pajama Sam 1: No Need to Hide When It's Dark Outside (Demo)", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_HE7_RESOURCES | GF_DEFAULT_TO_1X_SCALER, 0},
-	//{"socks", "Pajama Sam's Sock Works", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"zoodemo", "Putt-Putt Saves the Zoo (Demo)", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_DEFAULT_TO_1X_SCALER, 0},
+	{"freddemo", "Freddi Fish 1: The Case of the Missing Kelp Seeds (Demo)", GID_FREDDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_DEFAULT_TO_1X_SCALER, 0},
+	{"ff2-demo", "Freddi Fish 2: The Case of the Haunted Schoolhouse (Demo)", GID_PJSDEMO, 6, MDT_NONE,
+	GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_DEFAULT_TO_1X_SCALER, 0},
+	{"freddi2", "Freddi Fish 2: The Case of the Haunted Schoolhouse", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_DEFAULT_TO_1X_SCALER, 0},
+	{"maze", "Freddi Fish and Luther's Maze Madness", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_DEFAULT_TO_1X_SCALER, 0},
+	{"water", "Freddi Fish and Luther's Water Worries", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_DEFAULT_TO_1X_SCALER, 0},
+	{"pjs-demo", "Pajama Sam 1: No Need to Hide When It's Dark Outside (Demo)", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_DEFAULT_TO_1X_SCALER, 0},
+	{"socks", "Pajama Sam's Sock Works", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_DEFAULT_TO_1X_SCALER, 0},
+
+	//Not checked
+	{"ffhsdemo", "Freddi Fish 2: The Case of the Haunted Schoolhouse (Demo)", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_DEFAULT_TO_1X_SCALER, 0},
+	// Resource changed
+	{"pajama", "Pajama Sam 1: No Need to Hide When It's Dark Outside", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_DEFAULT_TO_1X_SCALER, 0},
 
 	// Humongous Entertainment Scumm Version 9.0 ?  Scummsys.90
-	//{"kinddemo", "Big Thinkers Kindergarten (Demo)", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	//{"1grademo", "Big Thinkers First Grade (Demo)", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"kinddemo", "Big Thinkers Kindergarten (Demo)", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"1grademo", "Big Thinkers First Grade (Demo)", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
 	{"freddi", "Freddi Fish 1: The Case of the Missing Kelp Seeds", GID_FREDDI, 6, MDT_NONE,
 	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_DEFAULT_TO_1X_SCALER, 0},
-	//{"f3-mdemo", "Freddi Fish 3: The Case of the Stolen Conch Shell (Demo)", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	//{"timedemo", "Putt-Putt Travels Through Time (Demo)", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	//{"spyfox", "Spyfox 1: Dry Cereal", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	//{"foxdemo", "Spyfox 1: Dry Cereal (Demo)", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	//{"spydemo", "Spyfox 1: Dry Cereal (Demo)", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"f3-mdemo", "Freddi Fish 3: The Case of the Stolen Conch Shell (Demo)", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"timedemo", "Putt-Putt Travels Through Time (Demo)", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"spyfox", "Spyfox 1: Dry Cereal", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"foxdemo", "Spyfox 1: Dry Cereal (Demo)", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"spydemo", "Spyfox 1: Dry Cereal (Demo)", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
 
 	// Humongous Entertainment Scumm Version 9.5 ?  Scummsys.95
-	//{"pj2demo", "Pajama Sam 2: Thunder and Lightning Aren't so Frightening (Demo)", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	//{"pajama2", "Pajama Sam 2: Thunder and Lightning Aren't so Frightening", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	//{"chase", "Spy Fox in Cheese Chase Game", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"pj2demo", "Pajama Sam 2: Thunder and Lightning Aren't so Frightening (Demo)", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"pajama2", "Pajama Sam 2: Thunder and Lightning Aren't so Frightening", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"chase", "Spy Fox in Cheese Chase Game", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
 
 	// Humongous Entertainment Scumm Version 9.8 ?  Scummsys.98
 	// these and later games can easily be identified by the .(a) file instead of a .he1
-	//{"freddi4", "Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	//{"f4-demo", "Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch (Demo)", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	//{"lost", "Pajama Sam's Lost & Found", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	//{"racedemo", "Putt-Putt Enters the Race (Demo)", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	//{"puttrace", "Putt-Putt Enters the Race", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"freddi4", "Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"f4-demo", "Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch (Demo)", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"lost", "Pajama Sam's Lost & Found", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"racedemo", "Putt-Putt Enters the Race (Demo)", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"puttrace", "Putt-Putt Enters the Race", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
 
 	// Humongous Entertainment Scumm Version 9.9 ?  Scummsys.99
-	//{"sf2-demo", "Spyfox 2: Some Assembly Required (Demo)", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	//{"spyfox2", "Spyfox 2: Some Assembly Required", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	//{"mustard", "Spy Fox in Hold the Mustard", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"sf2-demo", "Spyfox 2: Some Assembly Required (Demo)", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"spyfox2", "Spyfox 2: Some Assembly Required", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"mustard", "Spy Fox in Hold the Mustard", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
 
 	// Humongous Entertainment Scumm Version ?  engine moved to c++ 
-	//{"ff5demo", "Freddi Fish 5: The Case of the Creature of Coral Cave (Demo)", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	//{"freddicove", "Freddi Fish 5: The Case of the Creature of Coral Cave", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	//{"pj3-demo", "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet (Demo)", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	//{"pajama3", "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	//{"dog", "Putt-Putt and Pep's Dog on a Stick", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	//{"PuttsFunShop", "Putt-Putt's One-Stop Fun Shop", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	//{"putttime", "Putt-Putt Travels Through Time", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	//{"spyozon", "Spyfox 3: Operation Ozone", GID_PJSDEMO, 6, MDT_NONE,
-	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"ff5demo", "Freddi Fish 5: The Case of the Creature of Coral Cave (Demo)", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"freddicove", "Freddi Fish 5: The Case of the Creature of Coral Cave", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"pj3-demo", "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet (Demo)", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"pajama3", "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"dog", "Putt-Putt and Pep's Dog on a Stick", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"PuttsFunShop", "Putt-Putt's One-Stop Fun Shop", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"putttime", "Putt-Putt Travels Through Time", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
+	{"spyozon", "Spyfox 3: Operation Ozone", GID_PJSDEMO, 6, MDT_NONE,
+	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
 #endif
 	{NULL, NULL, 0, 0, MDT_NONE, 0, 0}
 };

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -d -r1.386 -r1.387
--- scumm.h	19 Mar 2004 23:19:57 -0000	1.386
+++ scumm.h	23 Mar 2004 01:59:02 -0000	1.387
@@ -90,7 +90,7 @@
 	GF_FEW_LOCALS          = 1 << 13,
 	GF_HUMONGOUS           = 1 << 14,
 	GF_AFTER_HEV7          = 1 << 15,
-	GF_HE7_RESOURCES       = 1 << 16,
+	GF_AFTER_HEV8          = 1 << 16,
 	
 	GF_FMTOWNS             = 1 << 17,
 	GF_AMIGA               = 1 << 18,

Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8018

Modified Files:
	configure 
Added Files:
	plugin.exp 
Log Message:
Added export symbol list for plugins (only used on OSX, if anybody wants to add support for Linux, go ahead)

--- NEW FILE: plugin.exp ---
_PLUGIN_createEngine
_PLUGIN_detectGames
_PLUGIN_getSupportedGames
_PLUGIN_name

Index: configure
===================================================================
RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- configure	21 Mar 2004 00:23:03 -0000	1.82
+++ configure	23 Mar 2004 00:30:50 -0000	1.83
@@ -624,7 +624,7 @@
 _mak_plugins='
 BUILD_PLUGINS := 1
 CXXFLAGS      += -DDYNAMIC_MODULES
-PLUGIN_LDFLAGS  += -bundle -bundle_loader $(EXECUTABLE)
+PLUGIN_LDFLAGS  += -bundle -bundle_loader $(EXECUTABLE) -exported_symbols_list "$(srcdir)/plugin.exp"
 PRE_OBJS_FLAGS  := -all_load
 POST_OBJS_FLAGS :=
 LIBS            += -ldl

Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5237

Modified Files:
	plugins.cpp 
Log Message:
With latest dlcompat on OSX, no need anymore to manually prepend an underscore before symbol names

Index: plugins.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/plugins.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- plugins.cpp	23 Mar 2004 00:12:49 -0000	1.29
+++ plugins.cpp	23 Mar 2004 00:16:36 -0000	1.30
@@ -124,13 +124,6 @@
 
 void *DynamicPlugin::findSymbol(const char *symbol) {
 #ifdef UNIX
-#ifdef MACOSX
-	// Need to prepend underscore on Mac OS X
-	char buffer[256];
-	buffer[0] = '_';
-	strcpy(buffer + 1, symbol);
-	symbol = buffer;
-#endif
 	void *func = dlsym(_dlHandle, symbol);
 	if (!func)
 		warning("Failed loading symbol '%s' from plugin '%s' (%s)", symbol, _filename.c_str(), dlerror());

Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4509

Modified Files:
	plugins.cpp 
Log Message:
fix dynamic version of LOAD_MODULE macro; fixed typo

Index: plugins.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/plugins.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- plugins.cpp	14 Mar 2004 23:37:11 -0000	1.28
+++ plugins.cpp	23 Mar 2004 00:12:49 -0000	1.29
@@ -133,7 +133,7 @@
 #endif
 	void *func = dlsym(_dlHandle, symbol);
 	if (!func)
-		warning("Failed loading symbold '%s' from plugin '%s' (%s)", symbol, _filename.c_str(), dlerror());
+		warning("Failed loading symbol '%s' from plugin '%s' (%s)", symbol, _filename.c_str(), dlerror());
 	return func;
 #else
 #error TODO
@@ -218,7 +218,7 @@
 	// the "ABI" version the plugin was built for, and we can compare that
 	// to the ABI version of the executable.
 	#define LOAD_MODULE(name, NAME) \
-		tryLoadPlugin(new DynamicPlugin("scumm/lib" name ".so"));
+		tryLoadPlugin(new DynamicPlugin(name "/lib" name ".so"));
 #else
 	// "Loader" for the static plugins
 	#define LOAD_MODULE(name, NAME) \

Update of /cvsroot/scummvm/scummvm/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3834/graphics

Modified Files:
	animation.cpp animation.h 
Log Message:
Unify MPEG2 code even more

Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/graphics/animation.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- animation.cpp	22 Mar 2004 20:46:30 -0000	1.4
+++ animation.cpp	23 Mar 2004 00:10:17 -0000	1.5
@@ -151,6 +151,82 @@
 #endif
 }
 
+bool BaseAnimationState::decodeFrame() {
+#ifdef USE_MPEG2
+	mpeg2_state_t state;
+	const mpeg2_sequence_t *sequence_i;
+	size_t size = (size_t) -1;
+
+	do {
+		state = mpeg2_parse(decoder);
+		sequence_i = info->sequence;
+
+		switch (state) {
+		case STATE_BUFFER:
+			size = mpgfile->read(buffer, BUFFER_SIZE);
+			mpeg2_buffer(decoder, buffer, buffer + size);
+			break;
+
+		case STATE_SLICE:
+		case STATE_END:
+			if (info->display_fbuf) {
+				/* simple audio video sync code:
+				 * we calculate the actual frame by taking the elapsed audio time and try
+				 * to stay inside +- 1 frame of this calculated frame number by dropping
+				 * frames if we run behind and delaying if we are too fast
+				 */
+
+				/* Avoid deadlock is sound was too far ahead */
+				if (bgSoundStream && !bgSound.isActive())
+					return false;
+
+				if (checkPaletteSwitch() || (bgSoundStream == NULL) ||
+					((_snd->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum + 1) ||
+					frameskipped > 10) {
+					if (frameskipped > 10) {
+						warning("force frame %i redraw", framenum);
+						frameskipped = 0;
+					}
+					drawYUV(sequence_i->width, sequence_i->height, info->display_fbuf->buf);
+
+					if (bgSoundStream) {
+						while ((_snd->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum)
+							_sys->delay_msecs(10);
+					} else {
+						ticks += 83;
+						while (_sys->get_msecs() < ticks)
+							_sys->delay_msecs(10);
+						// FIXME: This used to be used for the Sword2 version of this
+						// method. I do not see any compelling reason why it should be
+						// used, but maybe I am wrong; so if you know more, either
+						// remove this comment, or change the implementation of the 
+						// method to use "sleepUntil" for BS2.
+						//_vm->sleepUntil(ticks);
+					}
+
+				} else {
+					warning("dropped frame %i", framenum);
+					frameskipped++;
+				}
+
+#ifdef BACKEND_8BIT
+				buildLookup(palnum + 1, lutcalcnum);
+#endif
+
+				framenum++;
+				return true;
+
+			}
+			break;
+
+		default:
+			break;
+		}
+	} while (size);
+#endif
+	return false;
+}
+
 bool BaseAnimationState::checkPaletteSwitch() {
 #ifdef BACKEND_8BIT
 	// if we have reached the last image with this palette, switch to new one

Index: animation.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/graphics/animation.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- animation.h	22 Mar 2004 20:46:30 -0000	1.4
+++ animation.h	23 Mar 2004 00:10:17 -0000	1.5
@@ -123,8 +123,12 @@
 	virtual ~BaseAnimationState();
 
 	bool init(const char *name);
+	bool decodeFrame();
+
 protected:
 	bool checkPaletteSwitch();
+	virtual void drawYUV(int width, int height, byte *const *dat) = 0;
+
 #ifdef BACKEND_8BIT
 	void buildLookup(int p, int lines);
 	virtual void setPalette(byte *pal) = 0;

Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3834/sword2/driver

Modified Files:
	animation.cpp animation.h 
Log Message:
Unify MPEG2 code even more

Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/animation.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- animation.cpp	22 Mar 2004 20:46:30 -0000	1.34
+++ animation.cpp	23 Mar 2004 00:10:18 -0000	1.35
@@ -89,81 +89,19 @@
 
 #endif
 
-bool AnimationState::decodeFrame() {
-#ifdef USE_MPEG2
-	mpeg2_state_t state;
-	const mpeg2_sequence_t *sequence_i;
-	size_t size = (size_t) -1;
-
-	do {
-		state = mpeg2_parse(decoder);
-		sequence_i = info->sequence;
-
-		switch (state) {
-		case STATE_BUFFER:
-			size = mpgfile->read(buffer, BUFFER_SIZE);
-			mpeg2_buffer(decoder, buffer, buffer + size);
-			break;
-
-		case STATE_SLICE:
-		case STATE_END:
-			if (info->display_fbuf) {
-				/* simple audio video sync code:
-				 * we calculate the actual frame by taking the elapsed audio time and try
-				 * to stay inside +- 1 frame of this calculated frame number by dropping
-				 * frames if we run behind and delaying if we are too fast
-				 */
-
-				/* Avoid deadlock is sound was too far ahead */
-				if (bgSoundStream && !bgSound.isActive())
-					return false;
-
-				if (checkPaletteSwitch() || (bgSoundStream == NULL) ||
-					((_snd->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum + 1) ||
-					frameskipped > 10) {
-					if (frameskipped > 10) {
-						warning("force frame %i redraw", framenum);
-						frameskipped = 0;
-					}
+void AnimationState::drawYUV(int width, int height, byte *const *dat) {
 #ifdef BACKEND_8BIT
-					_vm->_graphics->plotYUV(lut, sequence_i->width, sequence_i->height, info->display_fbuf->buf);
+	_vm->_graphics->plotYUV(lut, width, height, dat);
+	// FIXME: We used to call setNeedFullRedraw() a bit later (that is,
+	// it was called by decodeFrame(), after the 'delay_msecs' calls, so
+	// after the syncing code. Not sure if moving it here causes any
+	// problems, and I have no way to test it. However I do not see why
+	// it should cause problems... of course that doesn't mean anything,
+	// only that I can't see that far :-)
+	_vm->_graphics->setNeedFullRedraw();
 #else
-					plotYUV(lookup, sequence_i->width, sequence_i->height, info->display_fbuf->buf);
-#endif
-
-					if (bgSoundStream) {
-						while ((_snd->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum)
-							_sys->delay_msecs(10);
-					} else {
-						ticks += 83;
-						_vm->sleepUntil(ticks);
-					}
-
-#ifdef BACKEND_8BIT
-					_vm->_graphics->setNeedFullRedraw();
-#endif
-
-				} else {
-					warning("dropped frame %i", framenum);
-					frameskipped++;
-				}
-
-#ifdef BACKEND_8BIT
-				buildLookup(palnum + 1, lutcalcnum);
-#endif
-
-				framenum++;
-				return true;
-
-			}
-			break;
-
-		default:
-			break;
-		}
-	} while (size);
+	plotYUV(lookup, width, height, dat);
 #endif
-	return false;
 }
 
 MovieInfo MoviePlayer::_movies[] = {

Index: animation.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/animation.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- animation.h	22 Mar 2004 20:46:30 -0000	1.26
+++ animation.h	23 Mar 2004 00:10:18 -0000	1.27
@@ -37,8 +37,6 @@
 	AnimationState(Sword2Engine *vm);
 	~AnimationState();
 
-	bool decodeFrame();
-
 #ifndef BACKEND_8BIT
 	void drawTextObject(SpriteInfo *s, uint8 *src);
 	void clearDisplay();
@@ -46,6 +44,7 @@
 #endif
 
 private:
+	void drawYUV(int width, int height, byte *const *dat);
 
 #ifdef BACKEND_8BIT
 	void setPalette(byte *pal);

Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3834/sword1

Modified Files:
	animation.cpp animation.h 
Log Message:
Unify MPEG2 code even more

Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/animation.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- animation.cpp	22 Mar 2004 20:46:30 -0000	1.22
+++ animation.cpp	23 Mar 2004 00:10:18 -0000	1.23
@@ -43,79 +43,13 @@
 
 #endif
 
-bool AnimationState::decodeFrame() {
-#ifdef USE_MPEG2
-	mpeg2_state_t state;
-	const mpeg2_sequence_t *sequence_i;
-	size_t size = (size_t) -1;
-
-	do {
-		state = mpeg2_parse(decoder);
-		sequence_i = info->sequence;
-
-		switch (state) {
-		case STATE_BUFFER:
-			size = mpgfile->read(buffer, BUFFER_SIZE);
-			mpeg2_buffer(decoder, buffer, buffer + size);
-			break;
-
-		case STATE_SLICE:
-		case STATE_END:
-			if (info->display_fbuf) {
-				/* simple audio video sync code:
-				 * we calculate the actual frame by taking the elapsed audio time and try
-				 * to stay inside +- 1 frame of this calculated frame number by dropping
-				 * frames if we run behind and delaying if we are too fast
-				 */
-
-				/* Avoid deadlock is sound was too far ahead */
-				if (bgSoundStream && !bgSound.isActive())
-					return false;
-
-				if (checkPaletteSwitch() || (bgSoundStream == NULL) ||
-					((_snd->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum + 1) ||
-					frameskipped > 10) {
-					if (frameskipped > 10) {
-						warning("force frame %i redraw", framenum);
-						frameskipped = 0;
-					}
+void AnimationState::drawYUV(int width, int height, byte *const *dat) {
 #ifdef BACKEND_8BIT
-					_scr->plotYUV(lut, sequence_i->width, sequence_i->height, info->display_fbuf->buf);
+	_scr->plotYUV(lut, width, height, dat);
 #else
-					plotYUV(lookup, sequence_i->width, sequence_i->height, info->display_fbuf->buf);
-					_sys->copy_rect_overlay(overlay, MOVIE_WIDTH, 0, 40, MOVIE_WIDTH, MOVIE_HEIGHT);
-#endif
-
-					if (bgSoundStream) {
-						while ((_snd->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum)
-							_sys->delay_msecs(10);
-					} else {
-						ticks += 83;
-						while (_sys->get_msecs() < ticks)
-							_sys->delay_msecs(10);
-					}
-
-				} else {
-					warning("dropped frame %i", framenum);
-					frameskipped++;
-				}
-
-#ifdef BACKEND_8BIT
-				buildLookup(palnum + 1, lutcalcnum);
-#endif
-
-				framenum++;
-				return true;
-
-			}
-			break;
-
-		default:
-			break;
-		}
-	} while (size);
+	plotYUV(lookup, width, height, dat);
+	_sys->copy_rect_overlay(overlay, MOVIE_WIDTH, 0, 40, MOVIE_WIDTH, MOVIE_HEIGHT);
 #endif
-	return false;
 }
 
 MoviePlayer::MoviePlayer(Screen *scr, SoundMixer *snd, OSystem *sys)

Index: animation.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/animation.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- animation.h	22 Mar 2004 20:46:30 -0000	1.12
+++ animation.h	23 Mar 2004 00:10:18 -0000	1.13
@@ -39,9 +39,8 @@
 	AnimationState(Screen *scr, SoundMixer *snd, OSystem *sys);
 	~AnimationState();
 
-	bool decodeFrame();
-
 private:
+	void drawYUV(int width, int height, byte *const *dat);
 
 #ifdef BACKEND_8BIT
 	void setPalette(byte *pal);

Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2951

Modified Files:
	objectstate.h 
Log Message:
Draw zbuffer for bitmap objects when available.


Index: objectstate.h
===================================================================
RCS file: /cvsroot/scummvm/residual/objectstate.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- objectstate.h	22 Mar 2004 11:23:37 -0000	1.3
+++ objectstate.h	23 Mar 2004 00:06:31 -0000	1.4
@@ -28,6 +28,8 @@
 
 	void draw() {
 		bitmap_->draw();
+		if (zbitmap_)
+			zbitmap_->draw();
 	}
 
 	private: