[Scummvm-cvs-logs] scummvm-tools master -> 3e93034f9013ee78af7bec44f0f1351b50ab7b73

DrMcCoy drmccoy at drmccoy.de
Sat Jun 16 02:42:21 CEST 2012


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .

Summary:
3e93034f90 TOOLS: Add support for Little Red in degob


Commit: 3e93034f9013ee78af7bec44f0f1351b50ab7b73
    https://github.com/scummvm/scummvm-tools/commit/3e93034f9013ee78af7bec44f0f1351b50ab7b73
Author: Sven Hesse (drmccoy at users.sourceforge.net)
Date: 2012-06-15T17:39:20-07:00

Commit Message:
TOOLS: Add support for Little Red in degob

Changed paths:
  A engines/gob/degob_script_littlered.cpp
    Makefile.common
    engines/gob/degob.cpp
    engines/gob/degob_script.h



diff --git a/Makefile.common b/Makefile.common
index 49c2119..ae3bd3b 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -100,6 +100,7 @@ degob_OBJS := \
 	engines/gob/degob_script_v6.o \
 	engines/gob/degob_script_bargon.o \
 	engines/gob/degob_script_fascin.o \
+	engines/gob/degob_script_littlered.o \
 	tool.o \
 	version.o \
 	$(UTILS)
@@ -146,6 +147,7 @@ degob_OBJS := \
 	engines/gob/degob_script_bargon.o \
 	engines/gob/degob_script_fascin.o \
 	engines/gob/degob_script_geisha.o \
+	engines/gob/degob_script_littlered.o \
 	tool.o \
 	version.o \
 	$(UTILS)
diff --git a/engines/gob/degob.cpp b/engines/gob/degob.cpp
index 09c7ced..1378638 100644
--- a/engines/gob/degob.cpp
+++ b/engines/gob/degob.cpp
@@ -113,17 +113,18 @@ void printHelp(const char *bin) {
 	printf("Usage: %s <version> <file.tot> [-o <offset>] [<file.ext>] [<commun.ext>]\n\n", bin);
 	printf("The disassembled script will be written to stdout.\n\n");
 	printf("Supported versions:\n");
-	printf("	Gob1     - Gobliiins 1\n");
-	printf("	Gob2     - Gobliins 2\n");
-	printf("	Gob3     - Goblins 3\n");
-	printf("	Ween     - Ween: The Prophecy\n");
-	printf("	Bargon   - Bargon Attack\n");
-	printf("	Fascin   - Fascination\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");
-	printf("	Geisha   - Geisha\n");
+	printf("	Gob1      - Gobliiins 1\n");
+	printf("	Gob2      - Gobliins 2\n");
+	printf("	Gob3      - Goblins 3\n");
+	printf("	Ween      - Ween: The Prophecy\n");
+	printf("	Bargon    - Bargon Attack\n");
+	printf("	Fascin    - Fascination\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");
+	printf("	Geisha    - Geisha\n");
+	printf("	LittleRed - Once Upon A Time: Little Red Riding Hood\n");
 }
 
 int getVersion(const char *verStr) {
@@ -149,6 +150,8 @@ int getVersion(const char *verStr) {
 		return 9;
 	else if (!scumm_stricmp(verStr, "Geisha"))
 		return 10;
+	else if (!scumm_stricmp(verStr, "LittleRed"))
+		return 11;
 
 	return -1;
 }
@@ -199,6 +202,9 @@ Script *initScript(byte *totData, uint32 totSize, ExtTable *extTable, int versio
 		case 10:
 			return new Script_Geisha(totData, totSize, extTable);
 			break;
+		case 11:
+			return new Script_LittleRed(totData, totSize, extTable);
+			break;
 	}
 	return 0;
 }
diff --git a/engines/gob/degob_script.h b/engines/gob/degob_script.h
index e6411da..cb6fcc1 100644
--- a/engines/gob/degob_script.h
+++ b/engines/gob/degob_script.h
@@ -423,6 +423,44 @@ protected:
 	virtual void goblinOpcode(int i, FuncParams &params);
 };
 
+class Script_LittleRed : public Script_v2 {
+public:
+	Script_LittleRed(byte *totData, uint32 totSize, ExtTable *extTable = 0);
+	virtual ~Script_LittleRed();
+
+protected:
+	typedef void (Script_LittleRed::*OpcodeDrawProcLittleRed)(FuncParams &);
+	typedef void (Script_LittleRed::*OpcodeFuncProcLittleRed)(FuncParams &);
+	typedef void (Script_LittleRed::*OpcodeGoblinProcLittleRed)(FuncParams &);
+	struct OpcodeDrawEntryLittleRed {
+		FuncType type;
+		OpcodeDrawProcLittleRed proc;
+		const char *desc;
+		const Param params[16];
+	};
+	struct OpcodeFuncEntryLittleRed {
+		FuncType type;
+		OpcodeFuncProcLittleRed proc;
+		const char *desc;
+		const Param params[16];
+	};
+	struct OpcodeGoblinEntryLittleRed {
+		FuncType type;
+		OpcodeGoblinProcLittleRed proc;
+		const char *desc;
+		const Param params[16];
+	};
+	const OpcodeDrawEntryLittleRed *_opcodesDrawLittleRed;
+	const OpcodeFuncEntryLittleRed *_opcodesFuncLittleRed;
+	const OpcodeGoblinEntryLittleRed *_opcodesGoblinLittleRed;
+	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);
+};
+
 class Script_v3 : public Script_v2 {
 public:
 	Script_v3(byte *totData, uint32 totSize, ExtTable *extTable = 0);
diff --git a/engines/gob/degob_script_littlered.cpp b/engines/gob/degob_script_littlered.cpp
new file mode 100644
index 0000000..9edbff3
--- /dev/null
+++ b/engines/gob/degob_script_littlered.cpp
@@ -0,0 +1,547 @@
+/* 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"
+#include "common/util.h"
+
+#define OPCODET(x) _OPCODET(Script_LittleRed, x)
+#define OPCODEF(x) _OPCODEF(Script_LittleRed, x)
+#define OPCODEB(x) _OPCODEB(Script_LittleRed, x)
+
+const int Script_LittleRed::_goblinFuncLookUp[][2] = {
+	{1, 0},
+	{2, 1},
+	{500, 2},
+	{501, 3}
+};
+
+Script_LittleRed::Script_LittleRed(byte *totData, uint32 totSize, ExtTable *extTable) :
+	Script_v2(totData, totSize, extTable) {
+
+	setupOpcodes();
+}
+
+Script_LittleRed::~Script_LittleRed() {
+}
+
+void Script_LittleRed::setupOpcodes() {
+	static const OpcodeDrawEntryLittleRed opcodesDraw[256] = {
+
+		/* 00 */
+		{OPCODEF(o2_loadMult), {PARAM_NONE}},
+		{OPCODEF(o2_playMult), {PARAM_NONE}},
+		{OPCODET(o2_freeMultKeys), {PARAM_UINT16}},
+		{OPCODET(oLittleRed_setWinSize), {PARAM_UINT16, PARAM_UINT16, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX}},
+		/* 04 */
+		{OPCODET(oLittleRed_closeWin), {PARAM_EXPR}},
+		{OPCODET(oLittleRed_activeWin), {PARAM_EXPR}},
+		{OPCODET(oLittleRed_openWin), {PARAM_EXPR, PARAM_VARINDEX}},
+		{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(oLittleRed_setRenderFlags), {PARAM_EXPR}},
+		{OPCODET(oLittleRed_setWinFlags), {PARAM_EXPR}},
+		/* 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 */
+		{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_pushVars), {PARAM_NONE}},
+		{OPCODEF(o2_popVars), {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}},
+		/* 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 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 54 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 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 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{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 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 84 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 88 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 8C */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* 90 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{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}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		/* A4 */
+		{TYPE_NONE, 0, 0, {PARAM_NONE}},
+		{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 OpcodeFuncEntryLittleRed 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_assign), {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_addHotspot), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_UINT16}},
+		{OPCODET(o2_removeHotspot), {PARAM_EXPR}},
+		{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}},
+		{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(oLittleRed_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_cleanupStr), {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}},
+		{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 OpcodeGoblinEntryLittleRed opcodesGoblin[15] = {
+		/* 00 */
+		{OPCODET(oLittleRed_DOSInterrupt1), {PARAM_NONE}},
+		{OPCODET(oLittleRed_DOSInterrupt2), {PARAM_NONE}},
+		{OPCODET(oLittleRed_playProtracker), {PARAM_NONE}},
+		{OPCODET(o2_stopProtracker), {PARAM_NONE}}
+	};
+
+	_opcodesDrawLittleRed = opcodesDraw;
+	_opcodesFuncLittleRed = opcodesFunc;
+	_opcodesGoblinLittleRed = opcodesGoblin;
+}
+
+void Script_LittleRed::drawOpcode(byte i, FuncParams &params) {
+	FuncType type = _opcodesDrawLittleRed[i].type;
+	params.desc = _opcodesDrawLittleRed[i].desc;
+	OpcodeDrawProcLittleRed op = _opcodesDrawLittleRed[i].proc;
+
+	if (type == TYPE_NONE)
+		error("No such opcodeDraw: %d", i);
+	if ((type == TYPE_TEXTDESC) || (type == TYPE_BOTHDESC))
+		printFuncDesc(params, _opcodesDrawLittleRed[i].params);
+	if ((type == TYPE_FUNCDESC) || (type == TYPE_BOTHDESC))
+		(this->*op)(params);
+}
+
+void Script_LittleRed::funcOpcode(byte i, byte j, FuncParams &params) {
+	int n = i*16 + j;
+	FuncType type = TYPE_NONE;
+	OpcodeFuncProcLittleRed op = 0;
+
+	if ((i <= 4) && (j <= 15)) {
+		op = _opcodesFuncLittleRed[n].proc;
+		params.desc = _opcodesFuncLittleRed[n].desc;
+		type = _opcodesFuncLittleRed[n].type;
+	}
+
+	if (type == TYPE_NONE)
+		error("No such opcodeFunc: %d.%d", i, j);
+	if ((type == TYPE_TEXTDESC) || (type == TYPE_BOTHDESC))
+		printFuncDesc(params, _opcodesFuncLittleRed[n].params);
+	if ((type == TYPE_FUNCDESC) || (type == TYPE_BOTHDESC))
+		(this->*op)(params);
+}
+
+void Script_LittleRed::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;
+	OpcodeGoblinProcLittleRed op = 0;
+
+	if (n >= 0) {
+		op = _opcodesGoblinLittleRed[n].proc;
+		params.desc = _opcodesGoblinLittleRed[n].desc;
+		type = _opcodesGoblinLittleRed[n].type;
+	}
+
+	if (type == TYPE_NONE)
+		error("No such opcodeGoblin: %d (%d)", i, n);
+	if ((type == TYPE_TEXTDESC) || (type == TYPE_BOTHDESC)) {
+		const Param *param = _opcodesGoblinLittleRed[n].params;
+		if (*param == PARAM_GOB)
+			printFuncDesc(params);
+		else
+			printFuncDesc(params, param);
+	}
+	if ((type == TYPE_FUNCDESC) || (type == TYPE_BOTHDESC))
+		(this->*op)(params);
+}






More information about the Scummvm-git-logs mailing list