[Scummvm-cvs-logs] SF.net SVN: scummvm:[34218] tools/trunk

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Sun Aug 31 02:05:09 CEST 2008


Revision: 34218
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34218&view=rev
Author:   drmccoy
Date:     2008-08-31 00:05:09 +0000 (Sun, 31 Aug 2008)

Log Message:
-----------
Adding (incomplete) The Last Dynasty support and renaming degob_script_urban to degob_script_v6

Modified Paths:
--------------
    tools/trunk/Makefile
    tools/trunk/degob.cpp
    tools/trunk/degob_script.h
    tools/trunk/degob_script_v1.cpp

Added Paths:
-----------
    tools/trunk/degob_script_v5.cpp
    tools/trunk/degob_script_v6.cpp

Removed Paths:
-------------
    tools/trunk/degob_script_urban.cpp

Modified: tools/trunk/Makefile
===================================================================
--- tools/trunk/Makefile	2008-08-30 23:59:46 UTC (rev 34217)
+++ tools/trunk/Makefile	2008-08-31 00:05:09 UTC (rev 34218)
@@ -150,7 +150,7 @@
 desword2$(EXEEXT): desword2.o util.o
 	$(CXX) $(LDFLAGS) -o $@ $+
 
-degob$(EXEEXT): degob.o degob_script.o degob_script_v1.o degob_script_v2.o degob_script_v3.o degob_script_v4.o degob_script_bargon.o degob_script_urban.o util.o
+degob$(EXEEXT): degob.o degob_script.o degob_script_v1.o degob_script_v2.o degob_script_v3.o degob_script_v4.o degob_script_v5.o degob_script_v6.o degob_script_bargon.o util.o
 	$(CXX) $(LDFLAGS) -o $@ $+
 
 encode_dxa$(EXEEXT): encode_dxa.o compress.o util.o

Modified: tools/trunk/degob.cpp
===================================================================
--- tools/trunk/degob.cpp	2008-08-30 23:59:46 UTC (rev 34217)
+++ tools/trunk/degob.cpp	2008-08-31 00:05:09 UTC (rev 34218)
@@ -98,6 +98,7 @@
 	printf("	Bargon   - Bargon Attack\n");
 	printf("	Lost     - Lost in Time\n");
 	printf("	Woodruff - The Bizarre Adventures of Woodruff and the Schnibble\n");
+	printf("	Dynasty  - The Last Dynasty\n");
 	printf("	Urban    - Urban Runner\n");
 }
 
@@ -116,8 +117,10 @@
 		return 5;
 	else if (!scumm_stricmp(verStr, "Woodruff"))
 		return 6;
+	else if (!scumm_stricmp(verStr, "Dynasty"))
+		return 7;
 	else if (!scumm_stricmp(verStr, "Urban"))
-		return 7;
+		return 8;
 
 	return -1;
 }
@@ -154,8 +157,11 @@
 			return new Script_v4(totData, totSize, extTable);
 			break;
 		case 7:
-			return new Script_Urban(totData, totSize, extTable);
+			return new Script_v5(totData, totSize, extTable);
 			break;
+		case 8:
+			return new Script_v6(totData, totSize, extTable);
+			break;
 	}
 	return 0;
 }

Modified: tools/trunk/degob_script.h
===================================================================
--- tools/trunk/degob_script.h	2008-08-30 23:59:46 UTC (rev 34217)
+++ tools/trunk/degob_script.h	2008-08-31 00:05:09 UTC (rev 34218)
@@ -418,36 +418,36 @@
 	virtual void goblinOpcode(int i, FuncParams &params);
 };
 
-class Script_Urban : public Script_v4 {
+class Script_v5 : public Script_v4 {
 public:
-	Script_Urban(byte *totData, uint32 totSize, ExtTable *extTable = 0);
-	virtual ~Script_Urban();
+	Script_v5(byte *totData, uint32 totSize, ExtTable *extTable = 0);
+	virtual ~Script_v5();
 
 protected:
-	typedef void (Script_Urban::*OpcodeDrawProcUrban)(FuncParams &);
-	typedef void (Script_Urban::*OpcodeFuncProcUrban)(FuncParams &);
-	typedef void (Script_Urban::*OpcodeGoblinProcUrban)(FuncParams &);
-	struct OpcodeDrawEntryUrban {
+	typedef void (Script_v5::*OpcodeDrawProcV5)(FuncParams &);
+	typedef void (Script_v5::*OpcodeFuncProcV5)(FuncParams &);
+	typedef void (Script_v5::*OpcodeGoblinProcV5)(FuncParams &);
+	struct OpcodeDrawEntryV5 {
 		FuncType type;
-		OpcodeDrawProcUrban proc;
+		OpcodeDrawProcV5 proc;
 		const char *desc;
 		const Param params[16];
 	};
-	struct OpcodeFuncEntryUrban {
+	struct OpcodeFuncEntryV5 {
 		FuncType type;
-		OpcodeFuncProcUrban proc;
+		OpcodeFuncProcV5 proc;
 		const char *desc;
 		const Param params[16];
 	};
-	struct OpcodeGoblinEntryUrban {
+	struct OpcodeGoblinEntryV5 {
 		FuncType type;
-		OpcodeGoblinProcUrban proc;
+		OpcodeGoblinProcV5 proc;
 		const char *desc;
 		const Param params[16];
 	};
-	const OpcodeDrawEntryUrban *_opcodesDrawUrban;
-	const OpcodeFuncEntryUrban *_opcodesFuncUrban;
-	const OpcodeGoblinEntryUrban *_opcodesGoblinUrban;
+	const OpcodeDrawEntryV5 *_opcodesDrawV5;
+	const OpcodeFuncEntryV5 *_opcodesFuncV5;
+	const OpcodeGoblinEntryV5 *_opcodesGoblinV5;
 	static const int _goblinFuncLookUp[][2];
 
 	virtual void setupOpcodes();
@@ -455,9 +455,50 @@
 	virtual void funcOpcode(byte i, byte j, FuncParams &params);
 	virtual void goblinOpcode(int i, FuncParams &params);
 
-	void oUrban_loadCursor(FuncParams &params);
-	void oUrban_createSprite(FuncParams &params);
-	void oUrban_istrlen(FuncParams &params);
+	void o5_spaceShooter(FuncParams &params);
+
+	void o5_istrlen(FuncParams &params);
 };
 
+class Script_v6 : public Script_v5 {
+public:
+	Script_v6(byte *totData, uint32 totSize, ExtTable *extTable = 0);
+	virtual ~Script_v6();
+
+protected:
+	typedef void (Script_v6::*OpcodeDrawProcV6)(FuncParams &);
+	typedef void (Script_v6::*OpcodeFuncProcV6)(FuncParams &);
+	typedef void (Script_v6::*OpcodeGoblinProcV6)(FuncParams &);
+	struct OpcodeDrawEntryV6 {
+		FuncType type;
+		OpcodeDrawProcV6 proc;
+		const char *desc;
+		const Param params[16];
+	};
+	struct OpcodeFuncEntryV6 {
+		FuncType type;
+		OpcodeFuncProcV6 proc;
+		const char *desc;
+		const Param params[16];
+	};
+	struct OpcodeGoblinEntryV6 {
+		FuncType type;
+		OpcodeGoblinProcV6 proc;
+		const char *desc;
+		const Param params[16];
+	};
+	const OpcodeDrawEntryV6 *_opcodesDrawV6;
+	const OpcodeFuncEntryV6 *_opcodesFuncV6;
+	const OpcodeGoblinEntryV6 *_opcodesGoblinV6;
+	static const int _goblinFuncLookUp[][2];
+
+	virtual void setupOpcodes();
+	virtual void drawOpcode(byte i, FuncParams &params);
+	virtual void funcOpcode(byte i, byte j, FuncParams &params);
+	virtual void goblinOpcode(int i, FuncParams &params);
+
+	void o6_loadCursor(FuncParams &params);
+	void o6_createSprite(FuncParams &params);
+};
+
 #endif // DEGOB_SCRIPT_H

Deleted: tools/trunk/degob_script_urban.cpp
===================================================================
--- tools/trunk/degob_script_urban.cpp	2008-08-30 23:59:46 UTC (rev 34217)
+++ tools/trunk/degob_script_urban.cpp	2008-08-31 00:05:09 UTC (rev 34218)
@@ -1,755 +0,0 @@
-/* DeGob - GobEngine Script disassembler
- * Copyright (C) 2008 The ScummVM project
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "degob_script.h"
-
-#define OPCODET(x) _OPCODET(Script_Urban, x)
-#define OPCODEF(x) _OPCODEF(Script_Urban, x)
-#define OPCODEB(x) _OPCODEB(Script_Urban, x)
-
-const int Script_Urban::_goblinFuncLookUp[][2] = {
-	{0, 0},
-	{1, 1},
-	{2, 2},
-	{4, 3},
-	{5, 4},
-	{6, 5},
-	{7, 6},
-	{8, 7},
-	{9, 8},
-	{10, 9},
-	{12, 10},
-	{13, 71},
-	{14, 12},
-	{15, 13},
-	{16, 14},
-	{21, 15},
-	{22, 16},
-	{23, 17},
-	{24, 18},
-	{25, 19},
-	{26, 20},
-	{27, 21},
-	{28, 22},
-	{29, 23},
-	{30, 24},
-	{32, 25},
-	{33, 26},
-	{34, 27},
-	{35, 28},
-	{36, 29},
-	{37, 30},
-	{40, 31},
-	{41, 32},
-	{42, 33},
-	{43, 34},
-	{44, 35},
-	{50, 36},
-	{52, 37},
-	{53, 38},
-	{100, 39},
-	{152, 40},
-	{200, 41},
-	{201, 42},
-	{202, 43},
-	{203, 44},
-	{204, 45},
-	{250, 46},
-	{251, 47},
-	{252, 48},
-	{500, 49},
-	{502, 50},
-	{503, 51},
-	{600, 52},
-	{601, 53},
-	{602, 54},
-	{603, 55},
-	{604, 56},
-	{605, 57},
-	{1000, 58},
-	{1001, 59},
-	{1002, 60},
-	{1003, 61},
-	{1004, 62},
-	{1005, 63},
-	{1006, 64},
-	{1008, 65},
-	{1009, 66},
-	{1010, 67},
-	{1011, 68},
-	{1015, 69},
-	{2005, 70},
-	{3, 71}
-};
-
-Script_Urban::Script_Urban(byte *totData, uint32 totSize, ExtTable *extTable) :
-	Script_v4(totData, totSize, extTable) {
-
-	setupOpcodes();
-}
-
-Script_Urban::~Script_Urban() {
-}
-
-void Script_Urban::setupOpcodes() {
-	static const OpcodeDrawEntryUrban opcodesDraw[256] = {
-		/* 00 */
-		{OPCODEF(o2_loadMult), {PARAM_NONE}},
-		{OPCODEF(o2_playMult), {PARAM_NONE}},
-		{OPCODET(o2_freeMultKeys), {PARAM_UINT16}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 04 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{OPCODET(o1_initCursor), {PARAM_VARINDEX, PARAM_VARINDEX, PARAM_INT16, PARAM_INT16, PARAM_INT16}},
-		/* 08 */
-		{OPCODET(o1_initCursorAnim), {PARAM_EXPR, PARAM_INT16, PARAM_INT16, PARAM_INT16}},
-		{OPCODET(o1_clearCursorAnim), {PARAM_EXPR}},
-		{OPCODET(o2_setRenderFlags), {PARAM_EXPR}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 0C */
-		{OPCODET(o2_draw0x0C), {PARAM_NONE}},
-		{OPCODET(o2_draw0x0D), {PARAM_EXPR, PARAM_EXPR}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 10 */
-		{OPCODEF(o1_loadAnim), {PARAM_NONE}},
-		{OPCODET(o1_freeAnim), {PARAM_EXPR}},
-		{OPCODET(o1_updateAnim), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_UINT16}},
-		{OPCODET(o2_multSub), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
-		/* 14 */
-		{OPCODET(o2_initMult), {PARAM_INT16, PARAM_INT16, PARAM_INT16, PARAM_INT16, PARAM_INT16, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX}},
-		{OPCODET(o1_freeMult), {PARAM_NONE}},
-		{OPCODET(o1_animate), {PARAM_NONE}},
-		{OPCODEF(o2_loadMultObject), {PARAM_NONE}},
-		/* 18 */
-		{OPCODET(o1_getAnimLayerInfo), {PARAM_EXPR, PARAM_EXPR, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX}},
-		{OPCODET(o1_getObjAnimSize), {PARAM_EXPR, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX}},
-		{OPCODEF(o1_loadStatic), {PARAM_NONE}},
-		{OPCODET(o1_freeStatic), {PARAM_EXPR}},
-		/* 1C */
-		{OPCODET(o2_renderStatic), {PARAM_EXPR, PARAM_EXPR}},
-		{OPCODET(o2_loadCurLayer), {PARAM_EXPR, PARAM_EXPR}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 20 */
-		{OPCODET(o2_playCDTrack), {PARAM_EXPR}},
-		{OPCODET(o2_waitCDTrackEnd), {PARAM_NONE}},
-		{OPCODET(o2_stopCD), {PARAM_NONE}},
-		{OPCODET(o2_readLIC), {PARAM_EXPR}},
-		/* 24 */
-		{OPCODET(o2_freeLIC), {PARAM_NONE}},
-		{OPCODET(o2_getCDTrackPos), {PARAM_VARINDEX, PARAM_VARINDEX}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 28 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 2C */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 30 */
-		{OPCODET(o2_loadFontToSprite), {PARAM_INT16, PARAM_INT16, PARAM_INT16, PARAM_INT16, PARAM_INT16}},
-		{OPCODET(o1_freeFontToSprite), {PARAM_INT16}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 34 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 38 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 3C */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 40 */
-		{OPCODEF(o2_totSub), {PARAM_NONE}},
-		{OPCODET(o2_switchTotSub), {PARAM_UINT16, PARAM_UINT16}},
-		{OPCODEF(o2_copyVars), {PARAM_NONE}},
-		{OPCODEF(o2_pasteVars), {PARAM_NONE}},
-		/* 44 */
-		{OPCODET(o4_draw0x44), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
-		{OPCODET(o4_draw0x45), {PARAM_EXPR, PARAM_EXPR}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 48 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 4C */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 50 */
-		{OPCODEF(o2_loadMapObjects), {PARAM_NONE}},
-		{OPCODET(o2_freeGoblins), {PARAM_NONE}},
-		{OPCODET(o2_moveGoblin), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
-		{OPCODET(o2_writeGoblinPos), {PARAM_VARINDEX, PARAM_VARINDEX, PARAM_EXPR}},
-		/* 54 */
-		{OPCODET(o2_stopGoblin), {PARAM_EXPR}},
-		{OPCODET(o2_setGoblinState), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
-		{OPCODET(o2_placeGoblin), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
-		{OPCODET(o4_draw0x57), {PARAM_VARINDEX, PARAM_VARINDEX}},
-		/* 58 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 5C */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 60 */
-		{OPCODET(o4_draw0x60), {PARAM_EXPR, PARAM_EXPR}},
-		{OPCODET(o4_draw0x61), {PARAM_EXPR}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 64 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 68 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 6C */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 70 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 74 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 78 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 7C */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 80 */
-		{OPCODET(o2_initScreen), {PARAM_UINT8, PARAM_UINT8, PARAM_EXPR, PARAM_EXPR}},
-		{OPCODET(o2_scroll), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
-		{OPCODET(o2_setScrollOffset), {PARAM_EXPR, PARAM_EXPR}},
-		{OPCODET(o4_playVmdOrMusic), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
-		/* 84 */
-		{OPCODET(o2_getImdInfo), {PARAM_EXPR, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX}},
-		{OPCODET(o2_openItk), {PARAM_EXPR}},
-		{OPCODET(o2_closeItk), {PARAM_NONE}},
-		{OPCODET(o2_setImdFrontSurf), {PARAM_NONE}},
-		/* 88 */
-		{OPCODET(o2_resetImdFrontSurf), {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{OPCODET(o4_draw0x8A), {PARAM_EXPR, PARAM_VARINDEX, PARAM_VARINDEX}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 8C */
-		{OPCODET(o4_draw0x8C), {PARAM_EXPR, PARAM_VARINDEX}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 90 */
-		{OPCODET(o4_draw0x90), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 94 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 98 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 9C */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* A0 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{OPCODET(o4_draw0xA1), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_VARINDEX}},
-		{OPCODET(o4_draw0xA2), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* A4 */
-		{OPCODET(o4_draw0xA4), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* A8 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* AC */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* B0 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* B4 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* B8 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* BC */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* C0 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* C4 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* C8 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* CC */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* D0 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* D4 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* D8 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* DC */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* E0 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* E4 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* E8 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* EC */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* F0 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* F4 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* F8 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* FC */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-	};
-
-	static const OpcodeFuncEntryUrban opcodesFunc[80] = {
-		/* 00 */
-		{OPCODEF(o1_callSub), {PARAM_NONE}},
-		{OPCODEF(o1_callSub), {PARAM_NONE}},
-		{OPCODET(o1_printTotText), {PARAM_INT16}},
-		{OPCODEF(oUrban_loadCursor), {PARAM_NONE}},
-		/* 04 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{OPCODEF(o1_switch), {PARAM_NONE}},
-		{OPCODEF(o1_repeatUntil), {PARAM_NONE}},
-		{OPCODEF(o1_whileDo), {PARAM_NONE}},
-		/* 08 */
-		{OPCODEF(o1_if), {PARAM_NONE}},
-		{OPCODEF(o2_evaluateStore), {PARAM_NONE}},
-		{OPCODEF(o1_loadSpriteToPos), {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 0C */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 10 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{OPCODEF(o2_printText), {PARAM_NONE}},
-		{OPCODEF(o1_loadTot), {PARAM_NONE}},
-		{OPCODEF(o1_palLoad), {PARAM_NONE}},
-		/* 14 */
-		{OPCODET(o1_keyFunc), {PARAM_INT16}},
-		{OPCODET(o1_capturePush), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
-		{OPCODET(o1_capturePop), {PARAM_NONE}},
-		{OPCODET(o2_animPalInit), {PARAM_INT16, PARAM_EXPR, PARAM_EXPR}},
-		/* 18 */
-		{OPCODET(o2_addCollision), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_UINT16}},
-		{OPCODET(o2_freeCollision), {PARAM_EXPR}},
-		{OPCODET(o3_getTotTextItemPart), {PARAM_UINT16, PARAM_VARINDEX, PARAM_EXPR}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 1C */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{OPCODEF(o1_drawOperations), {PARAM_NONE}},
-		{OPCODEF(o1_setcmdCount), {PARAM_NONE}},
-		/* 20 */
-		{OPCODEF(o1_return), {PARAM_NONE}},
-		{OPCODET(o1_renewTimeInVars), {PARAM_NONE}},
-		{OPCODET(o1_speakerOn), {PARAM_EXPR}},
-		{OPCODET(o1_speakerOff), {PARAM_NONE}},
-		/* 24 */
-		{OPCODET(o1_putPixel), {PARAM_INT16, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
-		{OPCODEF(o2_goblinFunc), {PARAM_NONE}},
-		{OPCODEF(oUrban_createSprite), {PARAM_NONE}},
-		{OPCODET(o1_freeSprite), {PARAM_INT16}},
-		/* 28 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 2C */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 30 */
-		{OPCODEF(o1_returnTo), {PARAM_NONE}},
-		{OPCODET(o1_loadSpriteContent), {PARAM_INT16, PARAM_INT16, PARAM_INT16}},
-		{OPCODET(o3_copySprite), {PARAM_INT16, PARAM_INT16, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_INT16}},
-		{OPCODET(o1_fillRect), {PARAM_INT16, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
-		/* 34 */
-		{OPCODET(o1_drawLine), {PARAM_INT16, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
-		{OPCODET(o1_strToLong), {PARAM_VARINDEX, PARAM_VARINDEX}},
-		{OPCODET(o1_invalidate), {PARAM_INT16, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
-		{OPCODET(o1_setBackDelta), {PARAM_EXPR, PARAM_EXPR}},
-		/* 38 */
-		{OPCODET(o1_playSound), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
-		{OPCODET(o2_stopSound), {PARAM_EXPR}},
-		{OPCODEF(o2_loadSound), {PARAM_NONE}},
-		{OPCODET(o1_freeSoundSlot), {PARAM_EXPR}},
-		/* 3C */
-		{OPCODET(o1_waitEndPlay), {PARAM_NONE}},
-		{OPCODET(o1_playComposition), {PARAM_VARINDEX, PARAM_EXPR}},
-		{OPCODET(o2_getFreeMem), {PARAM_VARINDEX, PARAM_VARINDEX}},
-		{OPCODET(o2_checkData), {PARAM_EXPR, PARAM_VARINDEX}},
-		/* 40 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{OPCODET(o1_prepareStr), {PARAM_VARINDEX}},
-		{OPCODET(o1_insertStr), {PARAM_VARINDEX, PARAM_EXPR}},
-		{OPCODET(o1_cutStr), {PARAM_VARINDEX, PARAM_EXPR, PARAM_EXPR}},
-		/* 44 */
-		{OPCODET(o1_strstr), {PARAM_VARINDEX, PARAM_EXPR, PARAM_VARINDEX}},
-//		{OPCODET(o1_istrlen), {PARAM_VARINDEX, PARAM_VARINDEX}},
-		{OPCODEF(oUrban_istrlen), {PARAM_NONE}},
-		{OPCODET(o1_setMousePos), {PARAM_EXPR, PARAM_EXPR}},
-		{OPCODET(o1_setFrameRate), {PARAM_EXPR}},
-		/* 48 */
-		{OPCODET(o1_animatePalette), {PARAM_NONE}},
-		{OPCODET(o1_animateCursor), {PARAM_NONE}},
-		{OPCODET(o1_blitCursor), {PARAM_NONE}},
-		{OPCODET(o1_loadFont), {PARAM_EXPR, PARAM_INT16}},
-		/* 4C */
-		{OPCODET(o1_freeFont), {PARAM_INT16}},
-		{OPCODET(o2_readData), {PARAM_EXPR, PARAM_VARINDEX, PARAM_EXPR, PARAM_EXPR}},
-		{OPCODET(o2_writeData), {PARAM_EXPR, PARAM_VARINDEX, PARAM_EXPR, PARAM_EXPR}},
-		{OPCODET(o1_manageDataFile), {PARAM_EXPR}},
-	};
-
-	static const OpcodeGoblinEntryUrban opcodesGoblin[72] = {
-		/* 00 */
-		{OPCODEF(o1_dummy), {PARAM_NONE}},
-		{OPCODET(o2_startInfogrames), {PARAM_UINT16}},
-		{OPCODET(o2_stopInfogrames), {PARAM_UINT16}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 04 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 08 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{OPCODEF(o2_playInfogrames), {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 0C */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 10 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 14 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 18 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 1C */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 20 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 24 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{OPCODET(o3_wobble), {PARAM_NONE}},
-		/* 28 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 2C */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 30 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 34 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 38 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 3C */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 40 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		/* 44 */
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{TYPE_NONE, 0, 0, {PARAM_NONE}},
-		{OPCODEF(o1_dummy), {PARAM_NONE}}
-	};
-
-	_opcodesDrawUrban = opcodesDraw;
-	_opcodesFuncUrban = opcodesFunc;
-	_opcodesGoblinUrban = opcodesGoblin;
-}
-
-void Script_Urban::drawOpcode(byte i, FuncParams &params) {
-	FuncType type = _opcodesDrawUrban[i].type;
-	params.desc = _opcodesDrawUrban[i].desc;
-	OpcodeDrawProcUrban op = _opcodesDrawUrban[i].proc;
-
-	if (type == TYPE_NONE)
-		warning("No such opcodeDraw: %d", i);
-	if ((type == TYPE_TEXTDESC) || (type == TYPE_BOTHDESC))
-		printFuncDesc(params, _opcodesDrawUrban[i].params);
-	if ((type == TYPE_FUNCDESC) || (type == TYPE_BOTHDESC))
-		(this->*op)(params);
-}
-
-void Script_Urban::funcOpcode(byte i, byte j, FuncParams &params) {
-	int n = i*16 + j;
-	FuncType type = TYPE_NONE;
-	OpcodeFuncProcUrban op = 0;
-
-	if ((i <= 4) && (j <= 15)) {
-		op = _opcodesFuncUrban[n].proc;
-		params.desc = _opcodesFuncUrban[n].desc;
-		type = _opcodesFuncUrban[n].type;
-	}
-
-	if (type == TYPE_NONE)
-		error("No such opcodeFunc: %d.%d", i, j);
-	if ((type == TYPE_TEXTDESC) || (type == TYPE_BOTHDESC))
-		printFuncDesc(params, _opcodesFuncUrban[n].params);
-	if ((type == TYPE_FUNCDESC) || (type == TYPE_BOTHDESC))
-		(this->*op)(params);
-}
-
-void Script_Urban::goblinOpcode(int i, FuncParams &params) {
-	int n = -1;
-	for (int j = 0; j < ARRAYSIZE(_goblinFuncLookUp); j++)
-		if (_goblinFuncLookUp[j][0] == i) {
-			n = _goblinFuncLookUp[j][1];
-			break;
-		}
-
-	FuncType type = TYPE_NONE;
-	OpcodeGoblinProcUrban op = 0;
-
-	if (n >= 0) {
-		op = _opcodesGoblinUrban[n].proc;
-		params.desc = _opcodesGoblinUrban[n].desc;
-		type = _opcodesGoblinUrban[n].type;
-	}
-
-	if (type == TYPE_NONE) {
-		warning("No such opcodeGoblin: %d (%d)", i, n);
-		o1_dummy(params);
-	}
-	if ((type == TYPE_TEXTDESC) || (type == TYPE_BOTHDESC)) {
-		const Param *param = _opcodesGoblinUrban[n].params;
-		if (*param == PARAM_GOB)
-			printFuncDesc(params);
-		else
-			printFuncDesc(params, param);
-	}
-	if ((type == TYPE_FUNCDESC) || (type == TYPE_BOTHDESC))
-		(this->*op)(params);
-}
-
-void Script_Urban::oUrban_istrlen(FuncParams &params) {
-	int16 sSize1, sSize2;
-
-	if (peekUint8() == 0x80)
-		skip(1);
-
-	startFunc(params);
-	print("%s, ", readVarIndex().c_str());
-	print("%s", readVarIndex().c_str());
-	endFunc();
-}
-
-void Script_Urban::oUrban_createSprite(FuncParams &params) {
-	uint32 pos;
-
-	pos = getPos();
-	skip(1);
-
-	startFunc(params);
-	if (peekUint8() == 0) {
-		seek(pos);
-		print("%d, ", readUint16());
-		print("%d, ", readUint16());
-		print("%d, ", readUint16());
-	} else {
-		seek(pos);
-		print("%s, ", readExpr().c_str());
-		print("%s, ", readExpr().c_str());
-		print("%s, ", readExpr().c_str());
-	}
-	print("%d", readUint16());
-	endFunc();
-}
-
-void Script_Urban::oUrban_loadCursor(FuncParams &params) {
-	int16 id = (int16) readUint16();
-
-	startFunc(params);
-	print("%d, ", id);
-	if (id == -1) {
-		print("%s, ", peekString());
-		skip(9);
-		print("%d, ", readUint16());
-		print("%d", (int8) readUint8());
-	} else if (id == -2) {
-		print("%d, ", readUint16());
-		print("%d, ", readUint16());
-		print("%d", (int8) readUint8());
-	} else {
-		print("%d", (int8) readUint8());
-	}
-	endFunc();
-}

Modified: tools/trunk/degob_script_v1.cpp
===================================================================
--- tools/trunk/degob_script_v1.cpp	2008-08-30 23:59:46 UTC (rev 34217)
+++ tools/trunk/degob_script_v1.cpp	2008-08-31 00:05:09 UTC (rev 34218)
@@ -740,9 +740,6 @@
 void Script_v1::o1_callSub(FuncParams &params) {
 	uint16 offset = readUint16();
 
-	if (offset < 128)
-		error("o1_callSub: Offset %d points into the header", offset);
-
 	printIndent();
 
 	uint32 pos = getPos();
@@ -751,11 +748,12 @@
 
 	if (peekUint8() == 1) {
 		print("sub_%d();\n", offset);
-		addFuncOffset(offset);
+		if (offset >= 128)
+			addFuncOffset(offset);
 	} else if (peekUint8() == 2)
 		print("o1_collisionsBlock(%d);\n", offset);
 	else
-		error("Unknown block type %d (%d)", peekUint8(), offset);
+		print("<Unknown block type %d (%d)>\n", peekUint8(), offset);
 
 	seek(pos);
 }

Added: tools/trunk/degob_script_v5.cpp
===================================================================
--- tools/trunk/degob_script_v5.cpp	                        (rev 0)
+++ tools/trunk/degob_script_v5.cpp	2008-08-31 00:05:09 UTC (rev 34218)
@@ -0,0 +1,734 @@
+/* DeGob - GobEngine Script disassembler
+ * Copyright (C) 2008 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "degob_script.h"
+
+#define OPCODET(x) _OPCODET(Script_v5, x)
+#define OPCODEF(x) _OPCODEF(Script_v5, x)
+#define OPCODEB(x) _OPCODEB(Script_v5, x)
+
+const int Script_v5::_goblinFuncLookUp[][2] = {
+	{0, 0},
+	{1, 0},
+	{80, 1},
+	{81, 2},
+	{82, 3},
+	{83, 4},
+	{84, 5},
+	{85, 6},
+	{86, 7},
+	{87, 0},
+	{88, 0},
+	{89, 0},
+	{90, 0},
+	{91, 0},
+	{92, 8},
+	{93, 0},
+	{94, 0},
+	{95, 9},
+	{96, 10},
+	{97, 11},
+	{98, 12},
+	{99, 0},
+	{100, 13},
+	{200, 14},
+	{30, 24},
+	{32, 25},
+	{33, 26},
+	{34, 27},
+	{35, 28},
+	{36, 29},
+	{37, 30},
+	{40, 31},
+	{41, 32},
+	{42, 33},
+	{43, 34},
+	{44, 35},
+	{50, 36},
+	{52, 37},
+	{53, 38},
+	{100, 39},
+	{152, 40},
+	{200, 41},
+	{201, 42},
+	{202, 43},
+	{203, 44},
+	{204, 45},
+	{250, 46},
+	{251, 47},
+	{252, 48},
+	{500, 49},
+	{502, 50},
+	{503, 51},
+	{600, 52},
+	{601, 53},
+	{602, 54},
+	{603, 55},
+	{604, 56},
+	{605, 57},
+	{1000, 58},
+	{1001, 59},
+	{1002, 60},
+	{1003, 61},
+	{1004, 62},
+	{1005, 63},
+	{1006, 64},
+	{1008, 65},
+	{1009, 66},
+	{1010, 67},
+	{1011, 68},
+	{1015, 69},
+	{2005, 70},
+	{3, 71}
+};
+
+Script_v5::Script_v5(byte *totData, uint32 totSize, ExtTable *extTable) :
+	Script_v4(totData, totSize, extTable) {
+
+	setupOpcodes();
+}
+
+Script_v5::~Script_v5() {
+}
+
+void Script_v5::setupOpcodes() {
+	static const OpcodeDrawEntryV5 opcodesDraw[256] = {
+		/* 00 */
+		{OPCODEF(o2_loadMult), {PARAM_NONE}},
+		{OPCODEF(o2_playMult), {PARAM_NONE}},
+		{OPCODET(o2_freeMultKeys), {PARAM_UINT16}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 04 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{OPCODET(o1_initCursor), {PARAM_VARINDEX, PARAM_VARINDEX, PARAM_INT16, PARAM_INT16, PARAM_INT16}},
+		/* 08 */
+		{OPCODET(o1_initCursorAnim), {PARAM_EXPR, PARAM_INT16, PARAM_INT16, PARAM_INT16}},
+		{OPCODET(o1_clearCursorAnim), {PARAM_EXPR}},
+		{OPCODET(o2_setRenderFlags), {PARAM_EXPR}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 0C */
+		{OPCODET(o2_draw0x0C), {PARAM_NONE}},
+		{OPCODET(o2_draw0x0D), {PARAM_EXPR, PARAM_EXPR}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 10 */
+		{OPCODEF(o1_loadAnim), {PARAM_NONE}},
+		{OPCODET(o1_freeAnim), {PARAM_EXPR}},
+		{OPCODET(o1_updateAnim), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_UINT16}},
+		{OPCODET(o2_multSub), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		/* 14 */
+		{OPCODET(o2_initMult), {PARAM_INT16, PARAM_INT16, PARAM_INT16, PARAM_INT16, PARAM_INT16, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX}},
+		{OPCODET(o1_freeMult), {PARAM_NONE}},
+		{OPCODET(o1_animate), {PARAM_NONE}},
+		{OPCODEF(o2_loadMultObject), {PARAM_NONE}},
+		/* 18 */
+		{OPCODET(o1_getAnimLayerInfo), {PARAM_EXPR, PARAM_EXPR, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX}},
+		{OPCODET(o1_getObjAnimSize), {PARAM_EXPR, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX}},
+		{OPCODEF(o1_loadStatic), {PARAM_NONE}},
+		{OPCODET(o1_freeStatic), {PARAM_EXPR}},
+		/* 1C */
+		{OPCODET(o2_renderStatic), {PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o2_loadCurLayer), {PARAM_EXPR, PARAM_EXPR}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 20 */
+		{OPCODET(o2_playCDTrack), {PARAM_EXPR}},
+		{OPCODET(o2_waitCDTrackEnd), {PARAM_NONE}},
+		{OPCODET(o2_stopCD), {PARAM_NONE}},
+		{OPCODET(o2_readLIC), {PARAM_EXPR}},
+		/* 24 */
+		{OPCODET(o2_freeLIC), {PARAM_NONE}},
+		{OPCODET(o2_getCDTrackPos), {PARAM_VARINDEX, PARAM_VARINDEX}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 28 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 2C */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 30 */
+		{OPCODET(o2_loadFontToSprite), {PARAM_INT16, PARAM_INT16, PARAM_INT16, PARAM_INT16, PARAM_INT16}},
+		{OPCODET(o1_freeFontToSprite), {PARAM_INT16}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 34 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 38 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 3C */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 40 */
+		{OPCODEF(o2_totSub), {PARAM_NONE}},
+		{OPCODET(o2_switchTotSub), {PARAM_UINT16, PARAM_UINT16}},
+		{OPCODEF(o2_copyVars), {PARAM_NONE}},
+		{OPCODEF(o2_pasteVars), {PARAM_NONE}},
+		/* 44 */
+		{OPCODET(o4_draw0x44), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o4_draw0x45), {PARAM_EXPR, PARAM_EXPR}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 48 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 4C */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 50 */
+		{OPCODEF(o2_loadMapObjects), {PARAM_NONE}},
+		{OPCODET(o2_freeGoblins), {PARAM_NONE}},
+		{OPCODET(o2_moveGoblin), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o2_writeGoblinPos), {PARAM_VARINDEX, PARAM_VARINDEX, PARAM_EXPR}},
+		/* 54 */
+		{OPCODET(o2_stopGoblin), {PARAM_EXPR}},
+		{OPCODET(o2_setGoblinState), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o2_placeGoblin), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o4_draw0x57), {PARAM_VARINDEX, PARAM_VARINDEX}},
+		/* 58 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 5C */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 60 */
+		{OPCODET(o4_draw0x60), {PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o5_deleteFile), {PARAM_EXPR}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 64 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 68 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 6C */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 70 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 74 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 78 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 7C */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 80 */
+		{OPCODET(o2_initScreen), {PARAM_UINT8, PARAM_UINT8, PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o2_scroll), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o2_setScrollOffset), {PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o4_playVmdOrMusic), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		/* 84 */
+		{OPCODET(o2_getImdInfo), {PARAM_EXPR, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX}},
+		{OPCODET(o2_openItk), {PARAM_EXPR}},
+		{OPCODET(o2_closeItk), {PARAM_NONE}},
+		{OPCODET(o2_setImdFrontSurf), {PARAM_NONE}},
+		/* 88 */
+		{OPCODET(o2_resetImdFrontSurf), {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{OPCODET(o4_draw0x8A), {PARAM_EXPR, PARAM_VARINDEX, PARAM_VARINDEX}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 8C */
+		{OPCODET(o4_draw0x8C), {PARAM_EXPR, PARAM_VARINDEX}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 90 */
+		{OPCODET(o4_draw0x90), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 94 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 98 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 9C */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* A0 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{OPCODET(o4_draw0xA1), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_VARINDEX}},
+		{OPCODET(o4_draw0xA2), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* A4 */
+		{OPCODET(o4_draw0xA4), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* A8 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* AC */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* B0 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* B4 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* B8 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* BC */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* C0 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* C4 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* C8 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* CC */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* D0 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* D4 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* D8 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* DC */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* E0 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* E4 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* E8 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* EC */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* F0 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* F4 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* F8 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* FC */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+	};
+
+	static const OpcodeFuncEntryV5 opcodesFunc[80] = {
+		/* 00 */
+		{OPCODEF(o1_callSub), {PARAM_NONE}},
+		{OPCODEF(o1_callSub), {PARAM_NONE}},
+		{OPCODET(o1_printTotText), {PARAM_INT16}},
+		{OPCODET(o1_loadCursor), {PARAM_INT16, PARAM_INT8}},
+		/* 04 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{OPCODEF(o1_switch), {PARAM_NONE}},
+		{OPCODEF(o1_repeatUntil), {PARAM_NONE}},
+		{OPCODEF(o1_whileDo), {PARAM_NONE}},
+		/* 08 */
+		{OPCODEF(o1_if), {PARAM_NONE}},
+		{OPCODEF(o2_evaluateStore), {PARAM_NONE}},
+		{OPCODEF(o1_loadSpriteToPos), {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 0C */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 10 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{OPCODEF(o2_printText), {PARAM_NONE}},
+		{OPCODEF(o1_loadTot), {PARAM_NONE}},
+		{OPCODEF(o1_palLoad), {PARAM_NONE}},
+		/* 14 */
+		{OPCODET(o1_keyFunc), {PARAM_INT16}},
+		{OPCODET(o1_capturePush), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o1_capturePop), {PARAM_NONE}},
+		{OPCODET(o2_animPalInit), {PARAM_INT16, PARAM_EXPR, PARAM_EXPR}},
+		/* 18 */
+		{OPCODET(o2_addCollision), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_UINT16}},
+		{OPCODET(o2_freeCollision), {PARAM_EXPR}},
+		{OPCODET(o3_getTotTextItemPart), {PARAM_UINT16, PARAM_VARINDEX, PARAM_EXPR}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 1C */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{OPCODEF(o1_drawOperations), {PARAM_NONE}},
+		{OPCODEF(o1_setcmdCount), {PARAM_NONE}},
+		/* 20 */
+		{OPCODEF(o1_return), {PARAM_NONE}},
+		{OPCODET(o1_renewTimeInVars), {PARAM_NONE}},
+		{OPCODET(o1_speakerOn), {PARAM_EXPR}},
+		{OPCODET(o1_speakerOff), {PARAM_NONE}},
+		/* 24 */
+		{OPCODET(o1_putPixel), {PARAM_INT16, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		{OPCODEF(o2_goblinFunc), {PARAM_NONE}},
+		{OPCODET(o2_createSprite), {PARAM_INT16, PARAM_INT16, PARAM_INT16, PARAM_INT16}},
+		{OPCODET(o1_freeSprite), {PARAM_INT16}},
+		/* 28 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 2C */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 30 */
+		{OPCODEF(o1_returnTo), {PARAM_NONE}},
+		{OPCODET(o1_loadSpriteContent), {PARAM_INT16, PARAM_INT16, PARAM_INT16}},
+		{OPCODET(o3_copySprite), {PARAM_INT16, PARAM_INT16, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_INT16}},
+		{OPCODET(o1_fillRect), {PARAM_INT16, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		/* 34 */
+		{OPCODET(o1_drawLine), {PARAM_INT16, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o1_strToLong), {PARAM_VARINDEX, PARAM_VARINDEX}},
+		{OPCODET(o1_invalidate), {PARAM_INT16, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o1_setBackDelta), {PARAM_EXPR, PARAM_EXPR}},
+		/* 38 */
+		{OPCODET(o1_playSound), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o2_stopSound), {PARAM_EXPR}},
+		{OPCODEF(o2_loadSound), {PARAM_NONE}},
+		{OPCODET(o1_freeSoundSlot), {PARAM_EXPR}},
+		/* 3C */
+		{OPCODET(o1_waitEndPlay), {PARAM_NONE}},
+		{OPCODET(o1_playComposition), {PARAM_VARINDEX, PARAM_EXPR}},
+		{OPCODET(o2_getFreeMem), {PARAM_VARINDEX, PARAM_VARINDEX}},
+		{OPCODET(o2_checkData), {PARAM_EXPR, PARAM_VARINDEX}},
+		/* 40 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{OPCODET(o1_prepareStr), {PARAM_VARINDEX}},
+		{OPCODET(o1_insertStr), {PARAM_VARINDEX, PARAM_EXPR}},
+		{OPCODET(o1_cutStr), {PARAM_VARINDEX, PARAM_EXPR, PARAM_EXPR}},
+		/* 44 */
+		{OPCODET(o1_strstr), {PARAM_VARINDEX, PARAM_EXPR, PARAM_VARINDEX}},
+		{OPCODEF(o5_istrlen), {PARAM_NONE}},
+		{OPCODET(o1_setMousePos), {PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o1_setFrameRate), {PARAM_EXPR}},
+		/* 48 */
+		{OPCODET(o1_animatePalette), {PARAM_NONE}},
+		{OPCODET(o1_animateCursor), {PARAM_NONE}},
+		{OPCODET(o1_blitCursor), {PARAM_NONE}},
+		{OPCODET(o1_loadFont), {PARAM_EXPR, PARAM_INT16}},
+		/* 4C */
+		{OPCODET(o1_freeFont), {PARAM_INT16}},
+		{OPCODET(o2_readData), {PARAM_EXPR, PARAM_VARINDEX, PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o2_writeData), {PARAM_EXPR, PARAM_VARINDEX, PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o1_manageDataFile), {PARAM_EXPR}},
+	};
+
+	static const OpcodeGoblinEntryV5 opcodesGoblin[72] = {
+		/* 00 */
+		{OPCODEF(o5_spaceShooter), {PARAM_NONE}},
+		{OPCODET(o5_getSystemCDSpeed), {PARAM_UINT16}},
+		{OPCODET(o5_getSystemRAM), {PARAM_UINT16}},
+		{OPCODET(o5_getSystemCPUSpeed), {PARAM_UINT16}},
+		/* 04 */
+		{OPCODET(o5_getSystemDrawSpeed), {PARAM_UINT16}},
+		{OPCODET(o5_totalSystemSpecs), {PARAM_UINT16}},
+		{OPCODET(o5_saveSystemSpecs), {PARAM_NONE}},
+		{OPCODET(o5_loadSystemSpecs), {PARAM_NONE}},
+		/* 08 */
+		{OPCODET(o5_gob92), {PARAM_UINT16}},
+		{OPCODET(o5_gob95), {PARAM_UINT16, PARAM_UINT16, PARAM_UINT16, PARAM_UINT16}},
+		{OPCODET(o5_gob96), {PARAM_UINT16, PARAM_UINT16, PARAM_UINT16, PARAM_UINT16}},
+		{OPCODET(o5_gob97), {PARAM_NONE}},
+		/* 0C */
+		{OPCODET(o5_gob98), {PARAM_NONE}},
+		{OPCODET(o5_gob100), {PARAM_UINT16, PARAM_UINT16, PARAM_UINT16, PARAM_UINT16}},
+		{OPCODET(o5_gob200), {PARAM_UINT16, PARAM_UINT16, PARAM_UINT16}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 10 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 14 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 18 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 1C */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 20 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 24 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 28 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 2C */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 30 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 34 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 38 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 3C */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 40 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 44 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+	};
+
+	_opcodesDrawV5 = opcodesDraw;
+	_opcodesFuncV5 = opcodesFunc;
+	_opcodesGoblinV5 = opcodesGoblin;
+}
+
+void Script_v5::drawOpcode(byte i, FuncParams &params) {
+	FuncType type = _opcodesDrawV5[i].type;
+	params.desc = _opcodesDrawV5[i].desc;
+	OpcodeDrawProcV5 op = _opcodesDrawV5[i].proc;
+
+	if (type == TYPE_NONE)
+		warning("No such opcodeDraw: %d", i);
+	if ((type == TYPE_TEXTDESC) || (type == TYPE_BOTHDESC))
+		printFuncDesc(params, _opcodesDrawV5[i].params);
+	if ((type == TYPE_FUNCDESC) || (type == TYPE_BOTHDESC))
+		(this->*op)(params);
+}
+
+void Script_v5::funcOpcode(byte i, byte j, FuncParams &params) {
+	int n = i*16 + j;
+	FuncType type = TYPE_NONE;
+	OpcodeFuncProcV5 op = 0;
+
+	if ((i <= 4) && (j <= 15)) {
+		op = _opcodesFuncV5[n].proc;
+		params.desc = _opcodesFuncV5[n].desc;
+		type = _opcodesFuncV5[n].type;
+	}
+
+	if (type == TYPE_NONE)
+		error("No such opcodeFunc: %d.%d", i, j);
+	if ((type == TYPE_TEXTDESC) || (type == TYPE_BOTHDESC))
+		printFuncDesc(params, _opcodesFuncV5[n].params);
+	if ((type == TYPE_FUNCDESC) || (type == TYPE_BOTHDESC))
+		(this->*op)(params);
+}
+
+void Script_v5::goblinOpcode(int i, FuncParams &params) {
+	int n = -1;
+	for (int j = 0; j < ARRAYSIZE(_goblinFuncLookUp); j++)
+		if (_goblinFuncLookUp[j][0] == i) {
+			n = _goblinFuncLookUp[j][1];
+			break;
+		}
+
+	FuncType type = TYPE_NONE;
+	OpcodeGoblinProcV5 op = 0;
+
+	if (n >= 0) {
+		op = _opcodesGoblinV5[n].proc;
+		params.desc = _opcodesGoblinV5[n].desc;
+		type = _opcodesGoblinV5[n].type;
+	}
+
+	if (type == TYPE_NONE) {
+		warning("No such opcodeGoblin: %d (%d)", i, n);
+		o1_dummy(params);
+	}
+	if ((type == TYPE_TEXTDESC) || (type == TYPE_BOTHDESC)) {
+		const Param *param = _opcodesGoblinV5[n].params;
+		if (*param == PARAM_GOB)
+			printFuncDesc(params);
+		else
+			printFuncDesc(params, param);
+	}
+	if ((type == TYPE_FUNCDESC) || (type == TYPE_BOTHDESC)) {
+		seek((uint32) -2, SEEK_CUR);
+		params.extraData = (int16) i;
+		(this->*op)(params);
+	}
+}
+
+void Script_v5::o5_spaceShooter(FuncParams &params) {
+	int16 paramCount = readUint16();
+
+	startFunc(params);
+	print("%d, ", params.extraData);
+	for (int i = 0; i < paramCount; i++) {
+		uint16 n = readUint16();
+
+		if (i < 3)
+			print("%d", n * 4);
+		else
+			print("%d", n);
+
+		if (i < (paramCount - 1))
+			print(", ");
+	}
+	endFunc();
+}
+
+void Script_v5::o5_istrlen(FuncParams &params) {
+	int16 sSize1, sSize2;
+
+	if (peekUint8() == 0x80)
+		skip(1);
+
+	startFunc(params);
+	print("%s, ", readVarIndex().c_str());
+	print("%s", readVarIndex().c_str());
+	endFunc();
+}


Property changes on: tools/trunk/degob_script_v5.cpp
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Date Rev Author URL Id
Added: svn:eol-style
   + native

Copied: tools/trunk/degob_script_v6.cpp (from rev 34195, tools/trunk/degob_script_urban.cpp)
===================================================================
--- tools/trunk/degob_script_v6.cpp	                        (rev 0)
+++ tools/trunk/degob_script_v6.cpp	2008-08-31 00:05:09 UTC (rev 34218)
@@ -0,0 +1,742 @@
+/* DeGob - GobEngine Script disassembler
+ * Copyright (C) 2008 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "degob_script.h"
+
+#define OPCODET(x) _OPCODET(Script_v6, x)
+#define OPCODEF(x) _OPCODEF(Script_v6, x)
+#define OPCODEB(x) _OPCODEB(Script_v6, x)
+
+const int Script_v6::_goblinFuncLookUp[][2] = {
+	{0, 0},
+	{1, 1},
+	{2, 2},
+	{4, 3},
+	{5, 4},
+	{6, 5},
+	{7, 6},
+	{8, 7},
+	{9, 8},
+	{10, 9},
+	{12, 10},
+	{13, 71},
+	{14, 12},
+	{15, 13},
+	{16, 14},
+	{21, 15},
+	{22, 16},
+	{23, 17},
+	{24, 18},
+	{25, 19},
+	{26, 20},
+	{27, 21},
+	{28, 22},
+	{29, 23},
+	{30, 24},
+	{32, 25},
+	{33, 26},
+	{34, 27},
+	{35, 28},
+	{36, 29},
+	{37, 30},
+	{40, 31},
+	{41, 32},
+	{42, 33},
+	{43, 34},
+	{44, 35},
+	{50, 36},
+	{52, 37},
+	{53, 38},
+	{100, 39},
+	{152, 40},
+	{200, 41},
+	{201, 42},
+	{202, 43},
+	{203, 44},
+	{204, 45},
+	{250, 46},
+	{251, 47},
+	{252, 48},
+	{500, 49},
+	{502, 50},
+	{503, 51},
+	{600, 52},
+	{601, 53},
+	{602, 54},
+	{603, 55},
+	{604, 56},
+	{605, 57},
+	{1000, 58},
+	{1001, 59},
+	{1002, 60},
+	{1003, 61},
+	{1004, 62},
+	{1005, 63},
+	{1006, 64},
+	{1008, 65},
+	{1009, 66},
+	{1010, 67},
+	{1011, 68},
+	{1015, 69},
+	{2005, 70},
+	{3, 71}
+};
+
+Script_v6::Script_v6(byte *totData, uint32 totSize, ExtTable *extTable) :
+	Script_v5(totData, totSize, extTable) {
+
+	setupOpcodes();
+}
+
+Script_v6::~Script_v6() {
+}
+
+void Script_v6::setupOpcodes() {
+	static const OpcodeDrawEntryV6 opcodesDraw[256] = {
+		/* 00 */
+		{OPCODEF(o2_loadMult), {PARAM_NONE}},
+		{OPCODEF(o2_playMult), {PARAM_NONE}},
+		{OPCODET(o2_freeMultKeys), {PARAM_UINT16}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 04 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{OPCODET(o1_initCursor), {PARAM_VARINDEX, PARAM_VARINDEX, PARAM_INT16, PARAM_INT16, PARAM_INT16}},
+		/* 08 */
+		{OPCODET(o1_initCursorAnim), {PARAM_EXPR, PARAM_INT16, PARAM_INT16, PARAM_INT16}},
+		{OPCODET(o1_clearCursorAnim), {PARAM_EXPR}},
+		{OPCODET(o2_setRenderFlags), {PARAM_EXPR}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 0C */
+		{OPCODET(o2_draw0x0C), {PARAM_NONE}},
+		{OPCODET(o2_draw0x0D), {PARAM_EXPR, PARAM_EXPR}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 10 */
+		{OPCODEF(o1_loadAnim), {PARAM_NONE}},
+		{OPCODET(o1_freeAnim), {PARAM_EXPR}},
+		{OPCODET(o1_updateAnim), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_UINT16}},
+		{OPCODET(o2_multSub), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		/* 14 */
+		{OPCODET(o2_initMult), {PARAM_INT16, PARAM_INT16, PARAM_INT16, PARAM_INT16, PARAM_INT16, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX}},
+		{OPCODET(o1_freeMult), {PARAM_NONE}},
+		{OPCODET(o1_animate), {PARAM_NONE}},
+		{OPCODEF(o2_loadMultObject), {PARAM_NONE}},
+		/* 18 */
+		{OPCODET(o1_getAnimLayerInfo), {PARAM_EXPR, PARAM_EXPR, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX}},
+		{OPCODET(o1_getObjAnimSize), {PARAM_EXPR, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX}},
+		{OPCODEF(o1_loadStatic), {PARAM_NONE}},
+		{OPCODET(o1_freeStatic), {PARAM_EXPR}},
+		/* 1C */
+		{OPCODET(o2_renderStatic), {PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o2_loadCurLayer), {PARAM_EXPR, PARAM_EXPR}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 20 */
+		{OPCODET(o2_playCDTrack), {PARAM_EXPR}},
+		{OPCODET(o2_waitCDTrackEnd), {PARAM_NONE}},
+		{OPCODET(o2_stopCD), {PARAM_NONE}},
+		{OPCODET(o2_readLIC), {PARAM_EXPR}},
+		/* 24 */
+		{OPCODET(o2_freeLIC), {PARAM_NONE}},
+		{OPCODET(o2_getCDTrackPos), {PARAM_VARINDEX, PARAM_VARINDEX}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 28 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 2C */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 30 */
+		{OPCODET(o2_loadFontToSprite), {PARAM_INT16, PARAM_INT16, PARAM_INT16, PARAM_INT16, PARAM_INT16}},
+		{OPCODET(o1_freeFontToSprite), {PARAM_INT16}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 34 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 38 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 3C */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 40 */
+		{OPCODEF(o2_totSub), {PARAM_NONE}},
+		{OPCODET(o2_switchTotSub), {PARAM_UINT16, PARAM_UINT16}},
+		{OPCODEF(o2_copyVars), {PARAM_NONE}},
+		{OPCODEF(o2_pasteVars), {PARAM_NONE}},
+		/* 44 */
+		{OPCODET(o4_draw0x44), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o4_draw0x45), {PARAM_EXPR, PARAM_EXPR}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 48 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 4C */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 50 */
+		{OPCODEF(o2_loadMapObjects), {PARAM_NONE}},
+		{OPCODET(o2_freeGoblins), {PARAM_NONE}},
+		{OPCODET(o2_moveGoblin), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o2_writeGoblinPos), {PARAM_VARINDEX, PARAM_VARINDEX, PARAM_EXPR}},
+		/* 54 */
+		{OPCODET(o2_stopGoblin), {PARAM_EXPR}},
+		{OPCODET(o2_setGoblinState), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o2_placeGoblin), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o4_draw0x57), {PARAM_VARINDEX, PARAM_VARINDEX}},
+		/* 58 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 5C */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 60 */
+		{OPCODET(o4_draw0x60), {PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o4_draw0x61), {PARAM_EXPR}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 64 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 68 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 6C */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 70 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 74 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 78 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 7C */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 80 */
+		{OPCODET(o2_initScreen), {PARAM_UINT8, PARAM_UINT8, PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o2_scroll), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o2_setScrollOffset), {PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o4_playVmdOrMusic), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		/* 84 */
+		{OPCODET(o2_getImdInfo), {PARAM_EXPR, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX}},
+		{OPCODET(o2_openItk), {PARAM_EXPR}},
+		{OPCODET(o2_closeItk), {PARAM_NONE}},
+		{OPCODET(o2_setImdFrontSurf), {PARAM_NONE}},
+		/* 88 */
+		{OPCODET(o2_resetImdFrontSurf), {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{OPCODET(o4_draw0x8A), {PARAM_EXPR, PARAM_VARINDEX, PARAM_VARINDEX}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 8C */
+		{OPCODET(o4_draw0x8C), {PARAM_EXPR, PARAM_VARINDEX}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 90 */
+		{OPCODET(o4_draw0x90), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 94 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 98 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 9C */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* A0 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{OPCODET(o4_draw0xA1), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_VARINDEX}},
+		{OPCODET(o4_draw0xA2), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* A4 */
+		{OPCODET(o4_draw0xA4), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* A8 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* AC */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* B0 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* B4 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* B8 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* BC */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* C0 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* C4 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* C8 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* CC */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* D0 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* D4 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* D8 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* DC */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* E0 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* E4 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* E8 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* EC */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* F0 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* F4 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* F8 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* FC */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+	};
+
+	static const OpcodeFuncEntryV6 opcodesFunc[80] = {
+		/* 00 */
+		{OPCODEF(o1_callSub), {PARAM_NONE}},
+		{OPCODEF(o1_callSub), {PARAM_NONE}},
+		{OPCODET(o1_printTotText), {PARAM_INT16}},
+		{OPCODEF(o6_loadCursor), {PARAM_NONE}},
+		/* 04 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{OPCODEF(o1_switch), {PARAM_NONE}},
+		{OPCODEF(o1_repeatUntil), {PARAM_NONE}},
+		{OPCODEF(o1_whileDo), {PARAM_NONE}},
+		/* 08 */
+		{OPCODEF(o1_if), {PARAM_NONE}},
+		{OPCODEF(o2_evaluateStore), {PARAM_NONE}},
+		{OPCODEF(o1_loadSpriteToPos), {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 0C */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 10 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{OPCODEF(o2_printText), {PARAM_NONE}},
+		{OPCODEF(o1_loadTot), {PARAM_NONE}},
+		{OPCODEF(o1_palLoad), {PARAM_NONE}},
+		/* 14 */
+		{OPCODET(o1_keyFunc), {PARAM_INT16}},
+		{OPCODET(o1_capturePush), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o1_capturePop), {PARAM_NONE}},
+		{OPCODET(o2_animPalInit), {PARAM_INT16, PARAM_EXPR, PARAM_EXPR}},
+		/* 18 */
+		{OPCODET(o2_addCollision), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_UINT16}},
+		{OPCODET(o2_freeCollision), {PARAM_EXPR}},
+		{OPCODET(o3_getTotTextItemPart), {PARAM_UINT16, PARAM_VARINDEX, PARAM_EXPR}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 1C */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{OPCODEF(o1_drawOperations), {PARAM_NONE}},
+		{OPCODEF(o1_setcmdCount), {PARAM_NONE}},
+		/* 20 */
+		{OPCODEF(o1_return), {PARAM_NONE}},
+		{OPCODET(o1_renewTimeInVars), {PARAM_NONE}},
+		{OPCODET(o1_speakerOn), {PARAM_EXPR}},
+		{OPCODET(o1_speakerOff), {PARAM_NONE}},
+		/* 24 */
+		{OPCODET(o1_putPixel), {PARAM_INT16, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		{OPCODEF(o2_goblinFunc), {PARAM_NONE}},
+		{OPCODEF(o6_createSprite), {PARAM_NONE}},
+		{OPCODET(o1_freeSprite), {PARAM_INT16}},
+		/* 28 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 2C */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 30 */
+		{OPCODEF(o1_returnTo), {PARAM_NONE}},
+		{OPCODET(o1_loadSpriteContent), {PARAM_INT16, PARAM_INT16, PARAM_INT16}},
+		{OPCODET(o3_copySprite), {PARAM_INT16, PARAM_INT16, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_INT16}},
+		{OPCODET(o1_fillRect), {PARAM_INT16, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		/* 34 */
+		{OPCODET(o1_drawLine), {PARAM_INT16, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o1_strToLong), {PARAM_VARINDEX, PARAM_VARINDEX}},
+		{OPCODET(o1_invalidate), {PARAM_INT16, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o1_setBackDelta), {PARAM_EXPR, PARAM_EXPR}},
+		/* 38 */
+		{OPCODET(o1_playSound), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o2_stopSound), {PARAM_EXPR}},
+		{OPCODEF(o2_loadSound), {PARAM_NONE}},
+		{OPCODET(o1_freeSoundSlot), {PARAM_EXPR}},
+		/* 3C */
+		{OPCODET(o1_waitEndPlay), {PARAM_NONE}},
+		{OPCODET(o1_playComposition), {PARAM_VARINDEX, PARAM_EXPR}},
+		{OPCODET(o2_getFreeMem), {PARAM_VARINDEX, PARAM_VARINDEX}},
+		{OPCODET(o2_checkData), {PARAM_EXPR, PARAM_VARINDEX}},
+		/* 40 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{OPCODET(o1_prepareStr), {PARAM_VARINDEX}},
+		{OPCODET(o1_insertStr), {PARAM_VARINDEX, PARAM_EXPR}},
+		{OPCODET(o1_cutStr), {PARAM_VARINDEX, PARAM_EXPR, PARAM_EXPR}},
+		/* 44 */
+		{OPCODET(o1_strstr), {PARAM_VARINDEX, PARAM_EXPR, PARAM_VARINDEX}},
+		{OPCODEF(o5_istrlen), {PARAM_NONE}},
+		{OPCODET(o1_setMousePos), {PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o1_setFrameRate), {PARAM_EXPR}},
+		/* 48 */
+		{OPCODET(o1_animatePalette), {PARAM_NONE}},
+		{OPCODET(o1_animateCursor), {PARAM_NONE}},
+		{OPCODET(o1_blitCursor), {PARAM_NONE}},
+		{OPCODET(o1_loadFont), {PARAM_EXPR, PARAM_INT16}},
+		/* 4C */
+		{OPCODET(o1_freeFont), {PARAM_INT16}},
+		{OPCODET(o2_readData), {PARAM_EXPR, PARAM_VARINDEX, PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o2_writeData), {PARAM_EXPR, PARAM_VARINDEX, PARAM_EXPR, PARAM_EXPR}},
+		{OPCODET(o1_manageDataFile), {PARAM_EXPR}},
+	};
+
+	static const OpcodeGoblinEntryV6 opcodesGoblin[72] = {
+		/* 00 */
+		{OPCODEF(o1_dummy), {PARAM_NONE}},
+		{OPCODET(o2_startInfogrames), {PARAM_UINT16}},
+		{OPCODET(o2_stopInfogrames), {PARAM_UINT16}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 04 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 08 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{OPCODEF(o2_playInfogrames), {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 0C */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 10 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 14 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 18 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 1C */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 20 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 24 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{OPCODET(o3_wobble), {PARAM_NONE}},
+		/* 28 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 2C */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 30 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 34 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 38 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 3C */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 40 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 44 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{OPCODEF(o1_dummy), {PARAM_NONE}}
+	};
+
+	_opcodesDrawV6 = opcodesDraw;
+	_opcodesFuncV6 = opcodesFunc;
+	_opcodesGoblinV6 = opcodesGoblin;
+}
+
+void Script_v6::drawOpcode(byte i, FuncParams &params) {
+	FuncType type = _opcodesDrawV6[i].type;
+	params.desc = _opcodesDrawV6[i].desc;
+	OpcodeDrawProcV6 op = _opcodesDrawV6[i].proc;
+
+	if (type == TYPE_NONE)
+		warning("No such opcodeDraw: %d", i);
+	if ((type == TYPE_TEXTDESC) || (type == TYPE_BOTHDESC))
+		printFuncDesc(params, _opcodesDrawV6[i].params);
+	if ((type == TYPE_FUNCDESC) || (type == TYPE_BOTHDESC))
+		(this->*op)(params);
+}
+
+void Script_v6::funcOpcode(byte i, byte j, FuncParams &params) {
+	int n = i*16 + j;
+	FuncType type = TYPE_NONE;
+	OpcodeFuncProcV6 op = 0;
+
+	if ((i <= 4) && (j <= 15)) {
+		op = _opcodesFuncV6[n].proc;
+		params.desc = _opcodesFuncV6[n].desc;
+		type = _opcodesFuncV6[n].type;
+	}
+
+	if (type == TYPE_NONE)
+		error("No such opcodeFunc: %d.%d", i, j);
+	if ((type == TYPE_TEXTDESC) || (type == TYPE_BOTHDESC))
+		printFuncDesc(params, _opcodesFuncV6[n].params);
+	if ((type == TYPE_FUNCDESC) || (type == TYPE_BOTHDESC))
+		(this->*op)(params);
+}
+
+void Script_v6::goblinOpcode(int i, FuncParams &params) {
+	int n = -1;
+	for (int j = 0; j < ARRAYSIZE(_goblinFuncLookUp); j++)
+		if (_goblinFuncLookUp[j][0] == i) {
+			n = _goblinFuncLookUp[j][1];
+			break;
+		}
+
+	FuncType type = TYPE_NONE;
+	OpcodeGoblinProcV6 op = 0;
+
+	if (n >= 0) {
+		op = _opcodesGoblinV6[n].proc;
+		params.desc = _opcodesGoblinV6[n].desc;
+		type = _opcodesGoblinV6[n].type;
+	}
+
+	if (type == TYPE_NONE) {
+		warning("No such opcodeGoblin: %d (%d)", i, n);
+		o1_dummy(params);
+	}
+	if ((type == TYPE_TEXTDESC) || (type == TYPE_BOTHDESC)) {
+		const Param *param = _opcodesGoblinV6[n].params;
+		if (*param == PARAM_GOB)
+			printFuncDesc(params);
+		else
+			printFuncDesc(params, param);
+	}
+	if ((type == TYPE_FUNCDESC) || (type == TYPE_BOTHDESC))
+		(this->*op)(params);
+}
+
+void Script_v6::o6_createSprite(FuncParams &params) {
+	uint32 pos;
+
+	pos = getPos();
+	skip(1);
+
+	startFunc(params);
+	if (peekUint8() == 0) {
+		seek(pos);
+		print("%d, ", readUint16());
+		print("%d, ", readUint16());
+		print("%d, ", readUint16());
+	} else {
+		seek(pos);
+		print("%s, ", readExpr().c_str());
+		print("%s, ", readExpr().c_str());
+		print("%s, ", readExpr().c_str());
+	}
+	print("%d", readUint16());
+	endFunc();
+}
+
+void Script_v6::o6_loadCursor(FuncParams &params) {
+	int16 id = (int16) readUint16();
+
+	startFunc(params);
+	print("%d, ", id);
+	if (id == -1) {
+		print("%s, ", peekString());
+		skip(9);
+		print("%d, ", readUint16());
+		print("%d", (int8) readUint8());
+	} else if (id == -2) {
+		print("%d, ", readUint16());
+		print("%d, ", readUint16());
+		print("%d", (int8) readUint8());
+	} else {
+		print("%d", (int8) readUint8());
+	}
+	endFunc();
+}


Property changes on: tools/trunk/degob_script_v6.cpp
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Date Rev Author URL Id
Added: svn:mergeinfo
   + 
Added: svn:eol-style
   + native


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