[Scummvm-cvs-logs] SF.net SVN: scummvm: [21030] tools/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Fri Mar 3 06:12:03 CET 2006
Revision: 21030
Author: fingolfin
Date: 2006-03-03 06:11:16 -0800 (Fri, 03 Mar 2006)
ViewCVS: http://svn.sourceforge.net/scummvm?rev=21030&view=rev
Log Message:
-----------
Get rid of useless MKID macro
Modified Paths:
--------------
tools/trunk/descumm-tool.cpp
tools/trunk/util.h
Modified: tools/trunk/descumm-tool.cpp
===================================================================
--- tools/trunk/descumm-tool.cpp 2006-03-03 13:50:11 UTC (rev 21029)
+++ tools/trunk/descumm-tool.cpp 2006-03-03 14:11:16 UTC (rev 21030)
@@ -346,21 +346,21 @@
printf("File too small to be a script\n");
return 1;
}
- switch (TO_LE_16(*((uint16 *)mem + 2))) {
- case MKID('LS'):
+ switch (TO_BE_16(*((uint16 *)mem + 2))) {
+ case 'LS':
printf("Script# %d\n", (byte)mem[6]);
mem += 7;
break; /* Local script */
- case MKID('SC'):
+ case 'SC':
mem += 6;
break; /* Script */
- case MKID('EN'):
+ case 'EN':
mem += 6;
break; /* Entry code */
- case MKID('EX'):
+ case 'EX':
mem += 6;
break; /* Exit code */
- case MKID('OC'):
+ case 'OC':
offs_of_line = skipVerbHeader_V34(mem);
break; /* Verb */
default:
Modified: tools/trunk/util.h
===================================================================
--- tools/trunk/util.h 2006-03-03 13:50:11 UTC (rev 21029)
+++ tools/trunk/util.h 2006-03-03 14:11:16 UTC (rev 21030)
@@ -90,8 +90,6 @@
#define TO_LE_16(a) (a)
#endif
-#define MKID(a) (((a&0xff) << 8) | ((a >> 8)&0xff))
-
#if defined(__GNUC__)
#define NORETURN_PRE
#define NORETURN_POST __attribute__((__noreturn__))
More information about the Scummvm-git-logs
mailing list