diff options
| author | Filippos Karapetis | 2011-01-07 19:31:19 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2011-01-07 19:31:19 +0000 |
| commit | 59d00fca17455ee3548d8f7ea1919142e1ec8e2e (patch) | |
| tree | dc5d131be7d2910c293ed58491e063f640b89a82 | |
| parent | b55e593cddd9b7b340c89f5521aaba4c49cc692f (diff) | |
| download | scummvm-rg350-59d00fca17455ee3548d8f7ea1919142e1ec8e2e.tar.gz scummvm-rg350-59d00fca17455ee3548d8f7ea1919142e1ec8e2e.tar.bz2 scummvm-rg350-59d00fca17455ee3548d8f7ea1919142e1ec8e2e.zip | |
SCI: Removed leftover end markers from the opcode formats array
svn-id: r55153
| -rw-r--r-- | engines/sci/engine/kernel_tables.h | 54 |
1 files changed, 26 insertions, 28 deletions
diff --git a/engines/sci/engine/kernel_tables.h b/engines/sci/engine/kernel_tables.h index 060fea43b8..c8f4332a4f 100644 --- a/engines/sci/engine/kernel_tables.h +++ b/engines/sci/engine/kernel_tables.h @@ -1078,8 +1078,6 @@ static const char *sci21_default_knames[] = { #endif -#define END Script_None - opcode_format g_opcode_formats[128][4] = { /*00*/ {Script_None}, {Script_None}, {Script_None}, {Script_None}, @@ -1092,47 +1090,47 @@ opcode_format g_opcode_formats[128][4] = { /*10*/ {Script_None}, {Script_None}, {Script_None}, {Script_None}, /*14*/ - {Script_None}, {Script_None}, {Script_None}, {Script_SRelative, END}, + {Script_None}, {Script_None}, {Script_None}, {Script_SRelative}, /*18*/ - {Script_SRelative, END}, {Script_SRelative, END}, {Script_SVariable, END}, {Script_None}, + {Script_SRelative}, {Script_SRelative}, {Script_SVariable}, {Script_None}, /*1C*/ - {Script_SVariable, END}, {Script_None}, {Script_None}, {Script_Variable, END}, + {Script_SVariable}, {Script_None}, {Script_None}, {Script_Variable}, /*20*/ - {Script_SRelative, Script_Byte, END}, {Script_Variable, Script_Byte, END}, {Script_Variable, Script_Byte, END}, {Script_Variable, Script_SVariable, Script_Byte, END}, + {Script_SRelative, Script_Byte}, {Script_Variable, Script_Byte}, {Script_Variable, Script_Byte}, {Script_Variable, Script_SVariable, Script_Byte}, /*24 (24=ret)*/ - {Script_End}, {Script_Byte, END}, {Script_Invalid}, {Script_Invalid}, + {Script_End}, {Script_Byte}, {Script_Invalid}, {Script_Invalid}, /*28*/ - {Script_Variable, END}, {Script_Invalid}, {Script_Byte, END}, {Script_Variable, Script_Byte, END}, + {Script_Variable}, {Script_Invalid}, {Script_Byte}, {Script_Variable, Script_Byte}, /*2C*/ - {Script_SVariable, END}, {Script_SVariable, Script_Variable, END}, {Script_None}, {Script_Invalid}, + {Script_SVariable}, {Script_SVariable, Script_Variable}, {Script_None}, {Script_Invalid}, /*30*/ - {Script_None}, {Script_Property, END}, {Script_Property, END}, {Script_Property, END}, + {Script_None}, {Script_Property}, {Script_Property}, {Script_Property}, /*34*/ - {Script_Property, END}, {Script_Property, END}, {Script_Property, END}, {Script_Property, END}, + {Script_Property}, {Script_Property}, {Script_Property}, {Script_Property}, /*38*/ - {Script_Property, END}, {Script_SRelative, END}, {Script_SRelative, END}, {Script_None}, + {Script_Property}, {Script_SRelative}, {Script_SRelative}, {Script_None}, /*3C*/ {Script_None}, {Script_None}, {Script_None}, {Script_Word}, /*40-4F*/ - {Script_Global, END}, {Script_Local, END}, {Script_Temp, END}, {Script_Param, END}, - {Script_Global, END}, {Script_Local, END}, {Script_Temp, END}, {Script_Param, END}, - {Script_Global, END}, {Script_Local, END}, {Script_Temp, END}, {Script_Param, END}, - {Script_Global, END}, {Script_Local, END}, {Script_Temp, END}, {Script_Param, END}, + {Script_Global}, {Script_Local}, {Script_Temp}, {Script_Param}, + {Script_Global}, {Script_Local}, {Script_Temp}, {Script_Param}, + {Script_Global}, {Script_Local}, {Script_Temp}, {Script_Param}, + {Script_Global}, {Script_Local}, {Script_Temp}, {Script_Param}, /*50-5F*/ - {Script_Global, END}, {Script_Local, END}, {Script_Temp, END}, {Script_Param, END}, - {Script_Global, END}, {Script_Local, END}, {Script_Temp, END}, {Script_Param, END}, - {Script_Global, END}, {Script_Local, END}, {Script_Temp, END}, {Script_Param, END}, - {Script_Global, END}, {Script_Local, END}, {Script_Temp, END}, {Script_Param, END}, + {Script_Global}, {Script_Local}, {Script_Temp}, {Script_Param}, + {Script_Global}, {Script_Local}, {Script_Temp}, {Script_Param}, + {Script_Global}, {Script_Local}, {Script_Temp}, {Script_Param}, + {Script_Global}, {Script_Local}, {Script_Temp}, {Script_Param}, /*60-6F*/ - {Script_Global, END}, {Script_Local, END}, {Script_Temp, END}, {Script_Param, END}, - {Script_Global, END}, {Script_Local, END}, {Script_Temp, END}, {Script_Param, END}, - {Script_Global, END}, {Script_Local, END}, {Script_Temp, END}, {Script_Param, END}, - {Script_Global, END}, {Script_Local, END}, {Script_Temp, END}, {Script_Param, END}, + {Script_Global}, {Script_Local}, {Script_Temp}, {Script_Param}, + {Script_Global}, {Script_Local}, {Script_Temp}, {Script_Param}, + {Script_Global}, {Script_Local}, {Script_Temp}, {Script_Param}, + {Script_Global}, {Script_Local}, {Script_Temp}, {Script_Param}, /*70-7F*/ - {Script_Global, END}, {Script_Local, END}, {Script_Temp, END}, {Script_Param, END}, - {Script_Global, END}, {Script_Local, END}, {Script_Temp, END}, {Script_Param, END}, - {Script_Global, END}, {Script_Local, END}, {Script_Temp, END}, {Script_Param, END}, - {Script_Global, END}, {Script_Local, END}, {Script_Temp, END}, {Script_Param, END} + {Script_Global}, {Script_Local}, {Script_Temp}, {Script_Param}, + {Script_Global}, {Script_Local}, {Script_Temp}, {Script_Param}, + {Script_Global}, {Script_Local}, {Script_Temp}, {Script_Param}, + {Script_Global}, {Script_Local}, {Script_Temp}, {Script_Param} }; #undef END |