[Scummvm-cvs-logs] CVS: tools descumm6.cpp,1.28,1.29
Max Horn
fingolfin at users.sourceforge.net
Sun Dec 15 11:49:03 CET 2002
Update of /cvsroot/scummvm/tools
In directory sc8-pr-cvs1:/tmp/cvs-serv17369
Modified Files:
descumm6.cpp
Log Message:
yet another actorset subopcode added; less reverse thinking when it comes to script types :-)
Index: descumm6.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm6.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- descumm6.cpp 15 Dec 2002 16:43:09 -0000 1.28
+++ descumm6.cpp 15 Dec 2002 19:48:31 -0000 1.29
@@ -47,19 +47,27 @@
#define JUMP_OPCODE 0x73
-#if defined(SCUMM_BIG_ENDIAN)
-
-uint32 inline TO_LE_32(uint32 a)
+uint32 inline SWAP_32(uint32 a)
{
return ((a >> 24) & 0xFF) + ((a >> 8) & 0xFF00) + ((a << 8) & 0xFF0000) +
((a << 24) & 0xFF000000);
}
-uint16 inline TO_LE_16(uint16 a)
+uint16 inline SWAP_16(uint16 a)
{
return ((a >> 8) & 0xFF) + ((a << 8) & 0xFF00);
}
+#if defined(SCUMM_BIG_ENDIAN)
+#define TO_BE_32(a) (a)
+#define TO_BE_16(a) (a)
+#define TO_LE_32(a) SWAP_32(a)
+#define TO_LE_16(a) SWAP_16(a)
+#else
+#define TO_BE_32(a) SWAP_32(a)
+#define TO_BE_16(a) SWAP_16(a)
+#define TO_LE_32(a) (a)
+#define TO_LE_16(a) (a)
#endif
struct StackEnt {
@@ -289,11 +297,7 @@
int get_word()
{
-#if defined(SCUMM_BIG_ENDIAN)
int i = TO_LE_16(*((short *)cur_pos));
-#else
- int i = *((short *)cur_pos);
-#endif
cur_pos += 2;
return i;
}
@@ -1213,6 +1217,7 @@
"\x61|setActorAnimSpeed,"
"\x62|setActorShadowMode,"
"\x63pp|setActorTalkPos,"
+ "\xC6p|setActorAnimVar,"
"\xD7|setActorNew3On,"
"\xD8|setActorNew3Off,"
"\xD9|initActorLittle,"
@@ -1616,12 +1621,8 @@
output = buf = (char *)malloc(8192);
-#if defined(SCUMM_BIG_ENDIAN)
- switch (TO_LE_32(*((long *)mem))) {
-#else
- switch (*((long *)mem)) {
-#endif
- case 'RCSL':
+ switch (TO_BE_32(*((long *)mem))) {
+ case 'LSCR':
if (scriptVersion == 7) {
printf("Script# %d\n", mem[8] + (mem[9] << 8));
mem += 10;
@@ -1630,16 +1631,16 @@
mem += 9;
}
break; /* Local script */
- case 'PRCS':
+ case 'SCRP':
mem += 8;
break; /* Script */
- case 'DCNE':
+ case 'ENCD':
mem += 8;
break; /* Entry code */
- case 'DCXE':
+ case 'EXDE':
mem += 8;
break; /* Exit code */
- case 'BREV':
+ case 'VERB':
mem = skipVerbHeader(mem + 8);
break; /* Verb */
default:
More information about the Scummvm-git-logs
mailing list