[Scummvm-cvs-logs] SF.net SVN: scummvm: [21226] tools/trunk/descumm6.cpp

kirben at users.sourceforge.net kirben at users.sourceforge.net
Sat Mar 11 22:25:02 CET 2006


Revision: 21226
Author:   kirben
Date:     2006-03-11 22:24:15 -0800 (Sat, 11 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21226&view=rev

Log Message:
-----------
Improve support for HE71 scripts

Modified Paths:
--------------
    tools/trunk/descumm6.cpp
Modified: tools/trunk/descumm6.cpp
===================================================================
--- tools/trunk/descumm6.cpp	2006-03-12 05:44:05 UTC (rev 21225)
+++ tools/trunk/descumm6.cpp	2006-03-12 06:24:15 UTC (rev 21226)
@@ -1841,7 +1841,7 @@
 				"\x5Bp|setWidth,"
 				"\x5Cp|setScale,"
 				"\x5D|setNeverZClip,"
-				"\x5Ep|setAlwayZClip?,"
+				"\x5Ep|setAlwayZClip,"
 				"\x5F|setIgnoreBoxes,"
 				"\x60|setFollowBoxes,"
 				"\x61p|setAnimSpeed,"
@@ -3308,7 +3308,7 @@
 					"\xB0|shakeOn,"
 					"\xB1|shakeOff,"
 					"\xB3ppp|darkenPalette,"
-					"\xB4pp|saveLoadThing,"
+					"\xB4pp|saveLoadRoom,"
 					"\xB5p|screenEffect,"
 					"\xB6ppppp|darkenPalette,"
 					"\xB7ppppp|setupShadowPalette,"
@@ -3316,7 +3316,9 @@
 					"\xBBpp|colorCycleDelay,"
 					"\xD5p|setPalette,"
 					"\xDCpp|copyPalColor,"
-					"\xDDsp|saveLoadThing2");
+					"\xDDsp|saveLoad,"
+					"\xEApp|swapObjects,"
+					"\xECpp|setRoomPalette");
 		else
 			ext(output, "x" "roomOps\0"
 					"\xACpp|roomScroll,"
@@ -3325,7 +3327,7 @@
 					"\xB0|shakeOn,"
 					"\xB1|shakeOff,"
 					"\xB3ppp|darkenPalette,"
-					"\xB4pp|saveLoadThing,"
+					"\xB4pp|saveLoadRoom,"
 					"\xB5p|screenEffect,"
 					"\xB6ppppp|darkenPalette,"
 					"\xB7ppppp|setupShadowPalette,"
@@ -3335,45 +3337,77 @@
 					"\xDCpp|copyPalColor");
 		break;
 	case 0x9D:
-		ext(output, "x" "actorOps\0"
-				"\xC5p|setCurActor,"
-				"\x4Cp|setCostume,"
-				"\x4Dpp|setWalkSpeed,"
-				"\x4El|setSound,"
-				"\x4Fp|setWalkFrame,"
-				"\x50pp|setTalkFrame,"
-				"\x51p|setStandFrame,"
-				"\x52ppp|actorSet:82:??,"
-				"\x53|init,"
-				"\x54p|setElevation,"
-				"\x55|setDefAnim,"
-				"\x56pp|setPalette,"
-				"\x57p|setTalkColor,"
-				"\x58s|setName,"
-				"\x59p|setInitFrame,"
-				"\x5Bp|setWidth,"
-				"\x5Cp|setScale,"
-				"\x5D|setNeverZClip,"
-				"\x5Ep|setAlwayZClip?,"
-				"\xE1p|setAlwayZClip?,"
-				"\x5F|setIgnoreBoxes,"
-				"\x60|setFollowBoxes,"
-				"\x61p|setAnimSpeed,"
-				"\x62p|setShadowMode,"
-				"\x63pp|setTalkPos,"
-				"\xC6pp|setAnimVar,"
-				"\xD7|setIgnoreTurnsOn,"
-				"\xD8|setIgnoreTurnsOff,"
-				"\xD9|initLittle,"
-				"\xDA|drawVirScr,"
-				"\xE3p|setLayer,"
-				"\xE4p|setWalkScript,"
-				"\xE5|setStanding,"
-				"\xE6p|setDirection,"
-				"\xE7p|turnToDirection,"
-				"\xE9|freeze,"
-				"\xEA|unfreeze,"
-				"\xEBp|setTalkScript");
+		if (HumongousFlag)
+			ext(output, "x" "actorOps\0"
+					"\xC5p|setCurActor,"
+					"\x4Cp|setCostume,"
+					"\x4Dpp|setWalkSpeed,"
+					"\x4El|setSound,"
+					"\x4Fp|setWalkFrame,"
+					"\x50pp|setTalkFrame,"
+					"\x51p|setStandFrame,"
+					"\x52ppp|actorSet:82:??,"
+					"\x53|init,"
+					"\x54p|setElevation,"
+					"\x55|setDefAnim,"
+					"\x56pp|setPalette,"
+					"\x57p|setTalkColor,"
+					"\x58s|setName,"
+					"\x59p|setInitFrame,"
+					"\x5Bp|setWidth,"
+					"\x5Cp|setScale,"
+					"\x5D|setNeverZClip,"
+					"\x5Ep|setAlwayZClip,"
+					"\x5F|setIgnoreBoxes,"
+					"\x60|setFollowBoxes,"
+					"\x61p|setAnimSpeed,"
+					"\x62p|setShadowMode,"
+					"\x63pp|setTalkPos,"
+					"\xC6pp|setAnimVar,"
+					"\xD7|setIgnoreTurnsOn,"
+					"\xD8|setIgnoreTurnsOff,"
+					"\xD9|initLittle,"
+					"\xDA|drawToBackBuf,"
+					"\xE1sp|setTalkieSlot");
+		else
+			ext(output, "x" "actorOps\0"
+					"\xC5p|setCurActor,"
+					"\x4Cp|setCostume,"
+					"\x4Dpp|setWalkSpeed,"
+					"\x4El|setSound,"
+					"\x4Fp|setWalkFrame,"
+					"\x50pp|setTalkFrame,"
+					"\x51p|setStandFrame,"
+					"\x52ppp|actorSet:82:??,"
+					"\x53|init,"
+					"\x54p|setElevation,"
+					"\x55|setDefAnim,"
+					"\x56pp|setPalette,"
+					"\x57p|setTalkColor,"
+					"\x58s|setName,"
+					"\x59p|setInitFrame,"
+					"\x5Bp|setWidth,"
+					"\x5Cp|setScale,"
+					"\x5D|setNeverZClip,"
+					"\x5Ep|setAlwayZClip,"
+					"\x5F|setIgnoreBoxes,"
+					"\x60|setFollowBoxes,"
+					"\x61p|setAnimSpeed,"
+					"\x62p|setShadowMode,"
+					"\x63pp|setTalkPos,"
+					"\xC6pp|setAnimVar,"
+					"\xD7|setIgnoreTurnsOn,"
+					"\xD8|setIgnoreTurnsOff,"
+					"\xD9|initLittle,"
+					"\xE1p|setAlwayZClip?,"
+					"\xE3p|setLayer,"
+					"\xE4p|setWalkScript,"
+					"\xE5|setStanding,"
+					"\xE6p|setDirection,"
+					"\xE7p|turnToDirection,"
+					"\xE9|freeze,"
+					"\xEA|unfreeze,"
+					"\xEBp|setTalkScript");
 		break;
 	case 0x9E:
 		if (HumongousFlag)
@@ -3854,6 +3888,12 @@
 		else
 			invalidop(NULL, code);
 		break;
+	case 0xF5:
+		if (HumongousFlag)
+			ext(output, "rppp|getStringLenForWidth");
+		else
+			invalidop(NULL, code);
+		break;
 	case 0xF6:
 		if (HumongousFlag)
 			ext(output, "rpppp|getCharIndexInString");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Scummvm-git-logs mailing list