Phase 2 of Simon renaming. Simon directory renaming

svn-id: r24009

1 files changed, 0 insertions, 1055 deletions

diff --git a/engines/simon/res.cpp b/engines/simon/res.cpp
deleted file mode 100644
index e8d4f2fd04..0000000000
--- a/engines/simon/res.cpp
+++ /dev/null
@@ -1,1055 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001  Ludvig Strigeus
- * Copyright (C) 2001-2006 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$
- *
- */
-
-// Resource file routines for Simon1/Simon2
-#include "common/stdafx.h"
-
-#include "common/file.h"
-
-#include "agos/agos.h"
-#include "agos/intern.h"
-#include "agos/sound.h"
-
-
-#ifdef USE_ZLIB
-#include <zlib.h>
-#endif
-
-using Common::File;
-
-namespace Simon {
-
-// Script opcodes to load into memory
-static const char *const opcode_arg_table_elvira[300] = {
-	"I ", "I ", "I ", "I ", "I ", "I ", "I ", "I ",	 "II ",	"II ", "II ", "II ", "F ", "F ", "FN ",	 /*  EQ",        */
-	"FN ", "FN ", "FN ", "FF ", "FF ", "FF ", "FF ", "II ", "II ", "a ", "a ", "n ", "n ", "p ",	 /*  PREP",      */
-	"N ", "I ", "I ", "I ",	 "I ",	"IN ",	"IB ", "IB ", "II ", "IB ", "N ", " ", " ", " ", "I ",	 /*  GET",       */
-	"I ","I ","I ", "I ","I ","I ",	"II ","II ","II ","II ","IBF ", "FIB ", "FF ", "N ", "NI ",
-	"IF ", "F ", "F ", "IB ", "IB ", "FN ",	"FN ", "FN ", "FF ", "FF ", "FN ", "FN ", "FF ", "FF ",	 /*  DIVF",      */
-	"FN ", "FF ", "FN ", "F ", "I ", "IN ", "IN ", "IB ", "IB ", "IB ", "IB ", "II ", "I ", "I ",	 /*  DEC",       */
-	"IN ", "T ", "F ", " ", "T ", "T ", "I ", "I ", " ", " ", "T ", " ", " ", " ", " ", " ", "T ",	 /*  PARSE",     */
-	" ", "N ", "INN ", "II ", "II ", "ITN ", "ITIN ", "ITIN ", "I3 ", "IN ", "I ",	 "I ", "Ivnn ",
-	"vnn ", "Ivnn ", "NN ",	"IT ", "INN ", " ", "N ", "N ", "N ", "T ", "v ", " ", " ", " ", " ",
-	"FN ", "I ", "TN ", "IT ", "II ", "I ", " ", "N ", "I ", " ", "I ", "NI ", "I ", "I ", "T ",	 /*  BECOME",    */
-	"I ", "I ", "N ", "N ", " ", "N ", "IF ", "IF ", "IF ", "IF ", "IF ", "IF ", "T ", "IB ",
-	"IB ", "IB ", "I ", " ", "vnnN ", "Ivnn ", "T ", "T ", "T ", "IF ", " ", " ", " ", "Ivnn ",
-	"IF ", "INI ", "INN ",  "IN ", "II ", "IFF ", "IIF ", "I ", "II ", "I ", "I ", "IN ", "IN ",	 /*  ROPENEXT",  */
-	"II ", "II ", "II ", "II ", "IIN ", "IIN ",  "IN ", "II ", "IN ", "IN ", "T ", "vanpan ",
-	"vIpI ", "T ", "T ", " ", " ",	"IN ", "IN ", "IN ", "IN ", "N ", "INTTT ",  "ITTT ",
-	"ITTT ", "I ", "I ", "IN ", "I ", " ", "F ", "NN ", "INN ", "INN ", "INNN ", "TF ", "NN ",	 /*  PICTURE",   */
-	"N ", "NNNNN ", "N ", " ", "NNNNNNN ", "N ", " ", "N ",	"NN ", "N ", "NNNNNIN ", "N ", "N ",	 /*  ENABLEBOX", */
-	"N ", "NNN ", "NNNN ", "INNN ", "IN ", "IN ", "TT ", "I ", "I ", "I ", "TTT ", "IN ", "IN ",	 /*  UNSETCLASS",*/
-	"FN ", "FN ", "FN ", "N ", "N ", "N ", "NI ", " ", " ",	 "N ", "I ", "INN ", "NN ", "N ",	 /*  WAITENDTUNE */
-	"N ", "Nan ", "NN ", " ", " ", " ", " ", " ", " ", " ", "IF ", "N ", " ", " ",	 " ", "II ",	 /*  PLACENOICONS*/
-	" ", "NI ","N ",
-};
-
-static const char *const opcode_arg_table_waxworks[256] = {
-	" ", "I ", "I ", "I ", "I ", "I ", "I ", "II ", "II ", "II ", "II ", "B ", "B ", "BN ", "BN ",
-	"BN ", "BN ", "BB ", "BB ", "BB ", "BB ", "II ", "II ", "N ", "I ", "I ", "I ", "IN ", "IB ",
-	"II ", "I ", "I ", "II ", "II ", "IBB ", "BIB ", "BB ", "B ", "BI ", "IB ", "B ", "B ", "BN ",
-	"BN ", "BN ", "BB ", "BB ", "BN ", "BN ", "BB ", "BB ", "BN ", "BB ", "BN ", "B ", "I ", "IB ",
-	"IB ", "II ", "I ", "I ", "IN ", "B ", "T ", "T ", "NNNNNB ", "BT ", "BT ", "T ", " ", "B ",
-	"N ", "IBN ", "I ", "I ", "I ", "NN ", " ", " ", "IT ", "II ", "I ", "B ", " ", "IB ", "IBB ",
-	"IIB ", "T ", "T ", "T ", "IB ", "IB ", "IB ", "B ", "BB ", "IBB ", "NB ", "N ", "NBNNN ", "N ",
-	" ", "BNNNNNN ", "B ", " ", "B ", "B ", "BB ", "NNNNNIN ", "N ", "N ", "N ", "NNN ", "NBNN ",
-	"IBNN ", "IB ", "IB ", "IB ", "IB ", "N ", "N ", "N ", "BI ", " ", " ", "N ", "I ", "IBB ",
-	"NN ", "N ", "N ", "Ban ", "BB ", " ", " ", " ", " ", "IB ", "B ", " ", "II ", " ", "BI ", "N ",
-	"I ", "IB ", "IB ", "IB ", "IB ", "IB ", "IB ", "IB ", "BI ", "BB ", "B ", "B ", "B ",	"B ",
-	"IBB ", "IBN ", "IB ", "B ", " ", "TB ", "TB ", "I ", "N ", "B ", "INB ", "INB ", "INB ", "INB ",
-	"INB ", "INB ", "INB ", "N ", " ", "INBB ", "B ", "B ", "Ian ", "B ", "B ", "B ", "B ", "T ",
-	"T ", "B ", " ", "I ", " ", " "
-};
-
-static const char *const opcode_arg_table_simon1win[256] = {
-	" ", "I ", "I ", "I ", "I ", "I ", "I ", "II ", "II ", "II ", "II ", "B ", "B ", "BN ", "BN ",
-	"BN ", "BN ", "BB ", "BB ", "BB ", "BB ", "II ", "II ", "N ", "I ", "I ", "I ", "IN ", "IB ",
-	"II ", "I ", "I ", "II ", "II ", "IBB ", "BIB ", "BB ", "B ", "BI ", "IB ", "B ", "B ", "BN ",
-	"BN ", "BN ", "BB ", "BB ", "BN ", "BN ", "BB ", "BB ", "BN ", "BB ", "BN ", "B ", "I ", "IB ",
-	"IB ", "II ", "I ", "I ", "IN ", "B ", "T ", "T ", "NNNNNB ", "BT ", "BTS ", "T ", " ", "B ",
-	"N ", "IBN ", "I ", "I ", "I ", "NN ", " ", " ", "IT ", "II ", "I ", "B ", " ", "IB ", "IBB ",
-	"IIB ", "T ", " ", " ", "IB ", "IB ", "IB ", "B ", "BB ", "IBB ", "NB ", "N ", "NBNNN ", "N ",
-	" ", "BNNNNNN ", "B ", " ", "B ", "B ", "BB ", "NNNNNIN ", "N ", "N ", "N ", "NNN ", "NBNN ",
-	"IBNN ", "IB ", "IB ", "IB ", "IB ", "N ", "N ", "N ", "BI ", " ", " ", "N ", "I ", "IBB ",
-	"NN ", "N ", "N ", "Ban ", "BB ", " ", " ", " ", " ", "IB ", "B ", " ", "II ", " ", "BI ", "N ",
-	"I ", "IB ", "IB ", "IB ", "IB ", "IB ", "IB ", "IB ", "BI ", "BB ", "B ", "B ", "B ", "B ",
-	"IBB ", "IBN ", "IB ", "B ", "BNBN ", "BBTS ", "N ", " ", "Ian ", "B ", "B ", "B ", "B ", "T ",
-	"T ", "B ", " ", "I ", " ", " ", "BBI ", "NNBB ", "BBB ", " ", " ", " ", " ", "N ", "N ", " ",
-	" ",
-};
-
-static const char *const opcode_arg_table_simon1dos[256] = {
-	" ", "I ", "I ", "I ", "I ", "I ", "I ", "II ", "II ", "II ", "II ", "B ", "B ", "BN ", "BN ",
-	"BN ", "BN ", "BB ", "BB ", "BB ", "BB ", "II ", "II ", "N ", "I ", "I ", "I ", "IN ", "IB ",
-	"II ", "I ", "I ", "II ", "II ", "IBB ", "BIB ", "BB ", "B ", "BI ", "IB ", "B ", "B ", "BN ",
-	"BN ", "BN ", "BB ", "BB ", "BN ", "BN ", "BB ", "BB ", "BN ", "BB ", "BN ", "B ", "I ", "IB ",
-	"IB ", "II ", "I ", "I ", "IN ", "B ", "T ", "T ", "NNNNNB ", "BT ", "BT ", "T ", " ", "B ",
-	"N ", "IBN ", "I ", "I ", "I ", "NN ", " ", " ", "IT ", "II ", "I ", "B ", " ", "IB ", "IBB ",
-	"IIB ", "T ", " ", " ", "IB ", "IB ", "IB ", "B ", "BB ", "IBB ", "NB ", "N ", "NBNNN ", "N ",
-	" ", "BNNNNNN ", "B ", " ", "B ", "B ", "BB ", "NNNNNIN ", "N ", "N ", "N ", "NNN ", "NBNN ",
-	"IBNN ", "IB ", "IB ", "IB ", "IB ", "N ", "N ", "N ", "BI ", " ", " ", "N ", "I ", "IBB ",
-	"NN ", "N ", "N ", "Ban ", "BB ", " ", " ", " ", " ", "IB ", "B ", " ", "II ", " ", "BI ", "N ",
-	"I ", "IB ", "IB ", "IB ", "IB ", "IB ", "IB ", "IB ", "BI ", "BB ", "B ", "B ", "B ", "B ",
-	"IBB ", "IBN ", "IB ", "B ", "BNBN ", "BBT ", "N ", " ", "Ian ", "B ", "B ", "B ", "B ", "T ",
-	"T ", "B ", " ", "I ", " ", " ", "BBI ", "NNBB ", "BBB ", " ", " ", " ", " ", "N ", "N ", " ",
-	" ",
-};
-
-static const char *const opcode_arg_table_simon2win[256] = {
-	" ", "I ", "I ", "I ", "I ", "I ", "I ", "II ", "II ", "II ", "II ", "B ", "B ", "BN ", "BN ",
-	"BN ", "BN ", "BB ", "BB ", "BB ", "BB ", "II ", "II ", "N ", "I ", "I ", "I ", "IN ", "IB ",
-	"II ", "I ", "I ", "II ", "II ", "IBB ", "BIB ", "BB ", "B ", "BI ", "IB ", "B ", "B ", "BN ",
-	"BN ", "BN ", "BB ", "BB ", "BN ", "BN ", "BB ", "BB ", "BN ", "BB ", "BN ", "B ", "I ", "IB ",
-	"IB ", "II ", "I ", "I ", "IN ", "B ", "T ", "T ", "NNNNNB ", "BT ", "BTS ", "T ", " ", "B ",
-	"N ", "IBN ", "I ", "I ", "I ", "NN ", " ", " ", "IT ", "II ", "I ", "B ", " ", "IB ", "IBB ",
-	"IIB ", "T ", " ", " ", "IB ", "IB ", "IB ", "B ", "BB ", "IBB ", "NB ", "N ", "NNBNNN ", "NN ",
-	" ", "BNNNNNN ", "B ", " ", "B ", "B ", "BB ", "NNNNNIN ", "N ", "N ", "N ", "NNN ", "NBNN ",
-	"IBNN ", "IB ", "IB ", "IB ", "IB ", "N ", "N ", "N ", "BI ", " ", " ", "N ", "I ", "IBB ",
-	"NNB ", "N ", "N ", "Ban ", "BB ", " ", " ", " ", " ", "IB ", "B ", " ", "II ", " ", "BI ",
-	"N ", "I ", "IB ", "IB ", "IB ", "IB ", "IB ", "IB ", "IB ", "BI ", "BB ", "B ", "B ", "B ",
-	"B ", "IBB ", "IBN ", "IB ", "B ", "BNBN ", "BBTS ", "N ", " ", "Ian ", "B ", "B ", "B ", "B ",
-	"T ", "T ", "B ", " ", "I ", " ", " ", "BBI ", "NNBB ", "BBB ", " ", " ", " ", " ", "N ", "N ",
-	" ", " ", "BT ", " ", "B "
-};
-
-static const char *const opcode_arg_table_simon2dos[256] = {
-	" ", "I ", "I ", "I ", "I ", "I ", "I ", "II ", "II ", "II ", "II ", "B ", "B ", "BN ", "BN ",
-	"BN ", "BN ", "BB ", "BB ", "BB ", "BB ", "II ", "II ", "N ", "I ", "I ", "I ", "IN ", "IB ",
-	"II ", "I ", "I ", "II ", "II ", "IBB ", "BIB ", "BB ", "B ", "BI ", "IB ", "B ", "B ", "BN ",
-	"BN ", "BN ", "BB ", "BB ", "BN ", "BN ", "BB ", "BB ", "BN ", "BB ", "BN ", "B ", "I ", "IB ",
-	"IB ", "II ", "I ", "I ", "IN ", "B ", "T ", "T ", "NNNNNB ", "BT ", "BT ", "T ", " ", "B ",
-	"N ", "IBN ", "I ", "I ", "I ", "NN ", " ", " ", "IT ", "II ", "I ", "B ", " ", "IB ", "IBB ",
-	"IIB ", "T ", " ", " ", "IB ", "IB ", "IB ", "B ", "BB ", "IBB ", "NB ", "N ", "NNBNNN ", "NN ",
-	" ", "BNNNNNN ", "B ", " ", "B ", "B ", "BB ", "NNNNNIN ", "N ", "N ", "N ", "NNN ", "NBNN ",
-	"IBNN ", "IB ", "IB ", "IB ", "IB ", "N ", "N ", "N ", "BI ", " ", " ", "N ", "I ", "IBB ",
-	"NNB ", "N ", "N ", "Ban ", "BB ", " ", " ", " ", " ", "IB ", "B ", " ", "II ", " ", "BI ",
-	"N ", "I ", "IB ", "IB ", "IB ", "IB ", "IB ", "IB ", "IB ", "BI ", "BB ", "B ", "B ", "B ",
-	"B ", "IBB ", "IBN ", "IB ", "B ", "BNBN ", "BBT ", "N ", " ", "Ian ", "B ", "B ", "B ", "B ",
-	"T ", "T ", "B ", " ", "I ", " ", " ", "BBI ", "NNBB ", "BBB ", " ", " ", " ", " ", "N ", "N ",
-	" ", " ", "BT ", " ", "B "
-};
-
-static const char *const opcode_arg_table_feeblefiles[256] = {
-	" ", "I ", "I ", "I ", "I ", "I ", "I ", "II ", "II ", "II ", "II ", "B ", "B ", "BN ", "BN ",
-	"BN ", "BN ", "BB ", "BB ", "BB ", "BB ", "II ", "II ", "N ", "I ", "I ", "I ", "IN ", "IB ",
-	"II ", "I ", "I ", "II ", "II ", "IBB ", "BIB ", "BB ", "B ", "BI ", "IB ", "B ", "B ", "BN ",
-	"BN ", "BN ", "BB ", "BB ", "BN ", "BN ", "BB ", "BB ", "BN ", "BB ", "BN ", "B ", "I ", "IB ",
-	"IB ", "II ", "I ", "I ", "IN ", "B ", "T ", "T ", "NNNNNB ", "BT ", "BTS ", "T ", " ", "B ",
-	"N ", "IBN ", "I ", "I ", "I ", "NN ", " ", " ", "IT ", "II ", "I ", "B ", " ", "IB ", "IBB ",
-	"IIB ", "T ", " ", " ", "IB ", "IB ", "IB ", "B ", "BB ", "IBB ", "NB ", "N ", "NNBNNN ", "NN ",
-	" ", "BNNNNNN ", "B ", " ", "B ", "B ", "BB ", "NNNNNIN ", "N ", "N ", "N ", "NNN ", "NBNN ",
-	"IBNN ", "IB ", "IB ", "IB ", "IB ", "N ", "N ", "N ", "BI ", " ", " ", "N ", "I ", "IBB ",
-	"NNB ", "N ", "N ", "Ban ", " ", " ", " ", " ", " ", "IB ", "B ", " ", "II ", " ", "BI ",
-	"N ", "I ", "IB ", "IB ", "IB ", "IB ", "IB ", "IB ", "IB ", "BI ", "BB ", "B ", "B ", "B ",
-	"B ", "IBB ", "IBN ", "IB ", "B ", "BNNN ", "BBTS ", "N ", " ", "Ian ", "B ", "B ", "B ", "B ",
-	"T ", "N ", " ", " ", "I ", " ", " ", "BBI ", "NNBB ", "BBB ", " ", " ", "T ", " ", "N ", "N ",
-	" ", " ", "BT ", " ", "B ", " ", "BBBB ", " ", " ", "BBBB ", "B ", "B ", "B ", "B "
-};
-
-static const char *const opcode_arg_table_puzzlepack[256] = {
-	" ", "I ", "I ", "I ", "I ", "I ", "I ", "II ", "II ", "II ", "II ", "N ", "N ", "NN ", "NN ",
-	"NN ", "NN ", "NN ", "NN ", "NN ", "NN ", "II ", "II ", "N ", "I ", "I ", "I ", "IN ", "IB ",
-	"II ", "I ", "I ", "II ", "II ", "IBN ", "NIB ", "NN ", "B ", "BI ", "IN ", "N ", "N ", "NN ",
-	"NN ", "NN ", "NN ", "NN ", "NN ", "NN ", "NN ", "NN ", "NN ", "NN ", "NN ", "B ", "I ", "IB ",
-	"IB ", "II ", "I ", "I ", "IN ", "N ", "T ", "T ", "NNNNNB ", "BTNN ", "BTS ", "T ", " ", "B ",
-	"N ", "IBN ", "I ", "I ", "I ", "NN ", " ", " ", "IT ", "II ", "I ", "B ", " ", "IB ", "IBB ",
-	"IIB ", "T ", " ", " ", "IB ", "IB ", "IB ", "B ", "BB ", "IBB ", "NB ", "N ", "NNBNNN ", "NN ",
-	" ", "BNNNNNN ", "B ", " ", "B ", "B ", "BB ", "NNNNNIN ", "N ", "N ", "N ", "NNN ", "NBNN ",
-	"IBNN ", "IB ", "IB ", "IB ", "IB ", "N ", "N ", "N ", "BI ", " ", " ", "N ", "I ", "IBB ",
-	"NNB ", "N ", "N ", "Ban ", " ", " ", " ", " ", " ", "IN ", "B ", " ", "II ", " ", "BI ",
-	"N ", "I ", "IB ", "IB ", "IB ", "IB ", "IB ", "IB ", "IB ", "BI ", "BB ", "N ", "N ", "N ",
-	"N ", "IBN ", "IBN ", "IN ", "B ", "BNNN ", "BBTS ", "N ", " ", "Ian ", "B ", "B ", "B ", "B ",
-	"T ", "N ", " ", " ", "I ", " ", " ", "BBI ", "NNBB ", "BBB ", " ", " ", "T ", " ", "N ", "N ",
-	" ", " ", "BT ", " ", "B ", " ", "BBBB ", " ", " ", "BBBB ", "B ", "B ", "B ", "B "
-};
-
-uint16 SimonEngine::to16Wrapper(uint value) {
-	if (getGameType() == GType_FF || getGameType() == GType_PP)
-		return TO_LE_16(value);
-	else
-		return TO_BE_16(value);
-}
-
-uint16 SimonEngine::readUint16Wrapper(const void *src) {
-	if (getGameType() == GType_FF || getGameType() == GType_PP)
-		return READ_LE_UINT16(src);
-	else
-		return READ_BE_UINT16(src);
-}
-
-uint32 SimonEngine::readUint32Wrapper(const void *src) {
-	if (getGameType() == GType_FF || getGameType() == GType_PP)
-		return READ_LE_UINT32(src);
-	else
-		return READ_BE_UINT32(src);
-}
-
-void SimonEngine::decompressData(const char *srcName, byte *dst, uint32 offset, uint32 srcSize, uint32 dstSize) {
-#ifdef USE_ZLIB
-		File in;
-		in.open(srcName);
-		if (in.isOpen() == false)
-			error("decompressData: Can't load %s", srcName);
-
-		in.seek(offset, SEEK_SET);
-		if (srcSize != dstSize) {
-			byte *srcBuffer = (byte *)malloc(srcSize);
-
-			if (in.read(srcBuffer, srcSize) != srcSize)
-				error("decompressData: Read failed");
-
-			unsigned long decompressedSize = dstSize;
-			int result = uncompress(dst, &decompressedSize, srcBuffer, srcSize);
-			if (result != Z_OK)
-				error("decompressData: Zlib uncompress error");
-			free(srcBuffer);
-		} else {
-			if (in.read(dst, dstSize) != dstSize)
-				error("decompressData: Read failed");
-		}
-		in.close();
-#else
-	error("Zlib support is required for Amiga and Macintosh versions");
-#endif
-}
-
-void SimonEngine::loadOffsets(const char *filename, int number, uint32 &file, uint32 &offset, uint32 &srcSize, uint32 &dstSize) {
-	Common::File in;
-
-	int offsSize = (getPlatform() == Common::kPlatformAmiga) ? 16 : 12;
-
-	/* read offsets from index */
-	in.open(filename);
-	if (in.isOpen() == false) {
-		error("loadOffsets: Can't load index file '%s'", filename);
-	}
-
-	in.seek(number * offsSize, SEEK_SET);
-	offset = in.readUint32LE();
-	dstSize = in.readUint32LE();
-	srcSize = in.readUint32LE();
-	file = in.readUint32LE();
-	in.close();
-}
-
-int SimonEngine::allocGamePcVars(File *in) {
-	uint item_array_size, item_array_inited, stringtable_num;
-	uint32 version;
-	uint i, start;
-
-	item_array_size = in->readUint32BE();
-	version = in->readUint32BE();
-	item_array_inited = in->readUint32BE();
-	stringtable_num = in->readUint32BE();
-
-	if (getGameType() == GType_ELVIRA || getGameType() == GType_ELVIRA2) {
-		item_array_inited = item_array_size;
-		start = 0;
-	} else {
-		item_array_inited += 2;				// first two items are predefined
-		item_array_size += 2;
-		start = 1;
-	}
-
-	if (version != 0x80)
-		error("allocGamePcVars: Not a runtime database");
-
-	_itemArrayPtr = (Item **)calloc(item_array_size, sizeof(Item *));
-	if (_itemArrayPtr == NULL)
-		error("allocGamePcVars: Out of memory for Item array");
-
-	_itemArraySize = item_array_size;
-	_itemArrayInited = item_array_inited;
-
-	for (i = start; i < item_array_inited; i++) {
-		_itemArrayPtr[i] = (Item *)allocateItem(sizeof(Item));
-	}
-
-	// The rest is cleared automatically by calloc
-	allocateStringTable(stringtable_num + 10);
-	_stringTabNum = stringtable_num;
-
-	return item_array_inited;
-}
-
-void SimonEngine::loadGamePcFile() {
-	Common::File in;
-	int num_inited_objects;
-	int i, file_size;
-
-	/* read main gamepc file */
-	in.open(getFileName(GAME_BASEFILE));
-	if (in.isOpen() == false) {
-		error("loadGamePcFile: Can't load gamepc file '%s'", getFileName(GAME_BASEFILE));
-	}
-
-	num_inited_objects = allocGamePcVars(&in);
-
-	createPlayer();
-	readGamePcText(&in);
-
-	int start;
-	if (getGameType() == GType_ELVIRA || getGameType() == GType_ELVIRA2) {
-		start = 0;
-	} else {
-		start = 2;
-	}
-
-	for (i = start; i < num_inited_objects; i++) {
-		readItemFromGamePc(&in, _itemArrayPtr[i]);
-	}
-
-	readSubroutineBlock(&in);
-
-	in.close();
-
-	if (getGameType() == GType_PP)
-		return;
-
-	/* Read list of TABLE resources */
-	in.open(getFileName(GAME_TBLFILE));
-	if (in.isOpen() == false) {
-		error("loadGamePcFile: Can't load table resources file '%s'", getFileName(GAME_TBLFILE));
-	}
-
-	file_size = in.size();
-
-	_tblList = (byte *)malloc(file_size);
-	if (_tblList == NULL)
-		error("loadGamePcFile: Out of memory for strip table list");
-	in.read(_tblList, file_size);
-	in.close();
-
-	/* Remember the current state */
-	_subroutineListOrg = _subroutineList;
-	_tablesHeapPtrOrg = _tablesHeapPtr;
-	_tablesHeapCurPosOrg = _tablesHeapCurPos;
-
-	if (getGameType() == GType_ELVIRA || getGameType() == GType_FF)
-		return;
-
-	/* Read list of TEXT resources */
-	in.open(getFileName(GAME_STRFILE));
-	if (in.isOpen() == false)
-		error("loadGamePcFile: Can't load text resources file '%s'", getFileName(GAME_STRFILE));
-
-	file_size = in.size();
-	_strippedTxtMem = (byte *)malloc(file_size);
-	if (_strippedTxtMem == NULL)
-		error("loadGamePcFile: Out of memory for strip text list");
-	in.read(_strippedTxtMem, file_size);
-	in.close();
-
-	if (getGameType() != GType_WW)
-		return;
-
-	/* Read list of ROOM ITEMS resources */
-	in.open(getFileName(GAME_RMSLFILE));
-	if (in.isOpen() == false) {
-		error("loadGamePcFile: Can't load room resources file '%s'", getFileName(GAME_XTBLFILE));
-	}
-
-	file_size = in.size();
-
-	_roomsList = (byte *)malloc(file_size);
-	if (_roomsList == NULL)
-		error("loadGamePcFile: Out of memory for room items list");
-	in.read(_roomsList, file_size);
-	in.close();
-
-	/* Read list of XTABLE resources */
-	in.open(getFileName(GAME_XTBLFILE));
-	if (in.isOpen() == false) {
-		error("loadGamePcFile: Can't load xtable resources file '%s'", getFileName(GAME_XTBLFILE));
-	}
-
-	file_size = in.size();
-
-	_xtblList = (byte *)malloc(file_size);
-	if (_xtblList == NULL)
-		error("loadGamePcFile: Out of memory for strip xtable list");
-	in.read(_xtblList, file_size);
-	in.close();
-
-	/* Remember the current state */
-	_xsubroutineListOrg = _subroutineList;
-	_xtablesHeapPtrOrg = _tablesHeapPtr;
-	_xtablesHeapCurPosOrg = _tablesHeapCurPos;
-
-}
-
-void SimonEngine::readGamePcText(Common::File *in) {
-	_textSize = in->readUint32BE();
-	_textMem = (byte *)malloc(_textSize);
-	if (_textMem == NULL)
-		error("readGamePcText: Out of text memory");
-
-	in->read(_textMem, _textSize);
-
-	setupStringTable(_textMem, _stringTabNum);
-}
-
-void SimonEngine::readItemFromGamePc(Common::File *in, Item *item) {
-	uint32 type;
-
-	if (getGameType() == GType_ELVIRA || getGameType() == GType_ELVIRA2) {
-		item->itemName = (uint16)in->readUint32BE();
-		item->adjective = in->readUint16BE();
-		item->noun = in->readUint16BE();
-		item->state = in->readUint16BE();
-		in->readUint16BE();
-		item->sibling = (uint16)fileReadItemID(in);
-		item->child = (uint16)fileReadItemID(in);
-		item->parent = (uint16)fileReadItemID(in);
-		in->readUint16BE();
-		in->readUint16BE();
-		in->readUint16BE();
-		item->classFlags = in->readUint16BE();
-		item->children = NULL;
-	} else {
-		item->adjective = in->readUint16BE();
-		item->noun = in->readUint16BE();
-		item->state = in->readUint16BE();
-		item->sibling = (uint16)fileReadItemID(in);
-		item->child = (uint16)fileReadItemID(in);
-		item->parent = (uint16)fileReadItemID(in);
-		in->readUint16BE();
-		item->classFlags = in->readUint16BE();
-		item->children = NULL;
-	}
-
-
-	type = in->readUint32BE();
-	while (type) {
-		type = in->readUint16BE();
-		if (type != 0)
-			readItemChildren(in, item, type);
-	}
-}
-
-void SimonEngine::readItemChildren(Common::File *in, Item *item, uint type) {
-	if (type == 1) {
-		if (getGameType() == GType_ELVIRA || getGameType() == GType_ELVIRA2) {
-			// FIXME
-			in->readUint32BE();
-			in->readUint32BE();
-			in->readUint16BE();
-		} else {
-			uint fr1 = in->readUint16BE();
-			uint fr2 = in->readUint16BE();
-			uint i, size;
-			uint j, k;
-			SubRoom *subRoom;
-
-			size = SubRoom_SIZE;
-			for (i = 0, j = fr2; i != 6; i++, j >>= 2)
-				if (j & 3)
-					size += sizeof(subRoom->roomExit[0]);
-
-			subRoom = (SubRoom *)allocateChildBlock(item, 1, size);
-			subRoom->subroutine_id = fr1;
-			subRoom->roomExitStates = fr2;
-
-			for (i = k = 0, j = fr2; i != 6; i++, j >>= 2)
-				if (j & 3)
-					subRoom->roomExit[k++] = (uint16)fileReadItemID(in);
-		}
-	} else if (type == 2) {
-		uint32 fr = in->readUint32BE();
-		uint i, k, size;
-		SubObject *subObject;
-
-		size = SubObject_SIZE;
-		for (i = 0; i != 16; i++)
-			if (fr & (1 << i))
-				size += sizeof(subObject->objectFlagValue[0]);
-
-		subObject = (SubObject *)allocateChildBlock(item, 2, size);
-		subObject->objectFlags = fr;
-
-		k = 0;
-		if (fr & 1) {
-			subObject->objectFlagValue[k++] = (uint16)in->readUint32BE();
-		}
-		for (i = 1; i != 16; i++)
-			if (fr & (1 << i))
-				subObject->objectFlagValue[k++] = in->readUint16BE();
-
-		subObject->objectName = (uint16)in->readUint32BE();
-	} else if (type == 4) {
-		// FIXME
-		fileReadItemID(in);
-		fileReadItemID(in);
-		fileReadItemID(in);
-		fileReadItemID(in);
-		fileReadItemID(in);
-		fileReadItemID(in);
-		fileReadItemID(in);
-		fileReadItemID(in);
-		fileReadItemID(in);
-		fileReadItemID(in);
-		fileReadItemID(in);
-		fileReadItemID(in);
-	} else if (type == 7) {
-		// FIXME
-		in->readUint16BE();
-		in->readUint16BE();
-	} else if (type == 8) {
-		SubUserChain *chain = (SubUserChain *)allocateChildBlock(item, 8, sizeof(SubUserChain));
-		chain->chChained = (uint16)fileReadItemID(in);
-	} else if (type == 9) {
-		setUserFlag(item, 0, in->readUint16BE());
-		setUserFlag(item, 1, in->readUint16BE());
-		setUserFlag(item, 2, in->readUint16BE());
-		setUserFlag(item, 3, in->readUint16BE());
-		if (getGameType() == GType_ELVIRA || getGameType() == GType_ELVIRA2) {
-			setUserFlag(item, 4, in->readUint16BE());
-			setUserFlag(item, 5, in->readUint16BE());
-			setUserFlag(item, 6, in->readUint16BE());
-			setUserFlag(item, 7, in->readUint16BE());
-			// FIXME
-			fileReadItemID(in); 
-			fileReadItemID(in);
-			fileReadItemID(in);
-			fileReadItemID(in);
-		}
-	} else if (type == 255) {
-		SubUserInherit *inherit = (SubUserInherit *)allocateChildBlock(item, 255, sizeof(SubUserInherit));
-		inherit->inMaster = (uint16)fileReadItemID(in);
-	} else {
-		error("readItemChildren: invalid type %d", type);
-	}
-}
-
-uint fileReadItemID(Common::File *in) {
-	uint32 val = in->readUint32BE();
-	if (val == 0xFFFFFFFF)
-		return 0;
-	return val + 2;
-}
-
-byte *SimonEngine::readSingleOpcode(Common::File *in, byte *ptr) {
-	int i, l;
-	const char *string_ptr;
-	uint opcode, val;
-
-	const char *const *table;
-
-	if (getGameType() == GType_PP)
-		table = opcode_arg_table_puzzlepack;
-	else if (getGameType() == GType_FF)
-		table = opcode_arg_table_feeblefiles;
-	else if (getGameType() == GType_SIMON2 && (getFeatures() & GF_TALKIE))
-		table = opcode_arg_table_simon2win;
-	else if (getGameType() == GType_SIMON2)
-		table = opcode_arg_table_simon2dos;
-	else if (getGameType() == GType_SIMON1 && (getFeatures() & GF_TALKIE))
-		table = opcode_arg_table_simon1win;
-	else if (getGameType() == GType_SIMON1)
-		table = opcode_arg_table_simon1dos;
-	else if (getGameType() == GType_WW)
-		table = opcode_arg_table_waxworks;
-	else
-		table = opcode_arg_table_elvira;
-
-	i = 0;
-	if (getGameType() == GType_ELVIRA || getGameType() == GType_ELVIRA2) {
-		opcode = READ_BE_UINT16(ptr);
-		ptr += 2;
-	} else {
-		opcode = *ptr++;
-	}
-
-	string_ptr = table[opcode];
-	if (!string_ptr)
-		error("Unable to locate opcode table. Perhaps you are using the wrong game target?");
-
-	for (;;) {
-		if (string_ptr[i] == ' ')
-			return ptr;
-
-		l = string_ptr[i++];
-
-		switch (l) {
-		case 'F':
-		case 'N':
-		case 'S':
-		case 'a':
-		case 'n':
-		case 'p':
-		case 'v':
-		case '3':
-			val = in->readUint16BE();
-			*ptr++ = val >> 8;
-			*ptr++ = val & 255;
-			break;
-
-		case 'B':
-			if (getGameType() == GType_ELVIRA || getGameType() == GType_ELVIRA2) {
-				val = in->readUint16BE();
-				*ptr++ = val >> 8;
-				*ptr++ = val & 255;
-			} else {
-				*ptr++ = in->readByte();
-				if (ptr[-1] == 0xFF) {
-					*ptr++ = in->readByte();
-				}
-			}
-			break;
-
-		case 'I':
-			val = in->readUint16BE();
-			switch (val) {
-			case 1:
-				val = 0xFFFF;
-				break;
-			case 3:
-				val = 0xFFFD;
-				break;
-			case 5:
-				val = 0xFFFB;
-				break;
-			case 7:
-				val = 0xFFF9;
-				break;
-			case 9:
-				val = 0xFFF7;
-				break;
-			default:
-				val = fileReadItemID(in);;
-			}
-			*ptr++ = val >> 8;
-			*ptr++ = val & 255;
-			break;
-
-		case 'T':
-			val = in->readUint16BE();
-			switch (val) {
-			case 0:
-				val = 0xFFFF;
-				break;
-			case 3:
-				val = 0xFFFD;
-				break;
-			default:
-				val = (uint16)in->readUint32BE();
-				break;
-			}
-			*ptr++ = val >> 8;
-			*ptr++ = val & 255;
-			break;
-		default:
-			error("readSingleOpcode: Bad cmd table entry %c", l);
-		}
-	}
-}
-
-void SimonEngine::openGameFile() {
-	if (!(getFeatures() & GF_OLD_BUNDLE)) {
-		_gameFile = new File();
-		_gameFile->open(getFileName(GAME_GMEFILE));
-
-		if (_gameFile->isOpen() == false)
-			error("openGameFile: Can't load game file '%s'", getFileName(GAME_GMEFILE));
-
-		uint32 size = _gameFile->readUint32LE();
-
-		_gameOffsetsPtr = (uint32 *)malloc(size);
-		if (_gameOffsetsPtr == NULL)
-			error("openGameFile: Out of memory, game offsets");
-
-		readGameFile(_gameOffsetsPtr, 0, size);
-#if defined(SCUMM_BIG_ENDIAN)
-		for (uint r = 0; r < size / 4; r++)
-			_gameOffsetsPtr[r] = FROM_LE_32(_gameOffsetsPtr[r]);
-#endif
-	}
-}
-
-void SimonEngine::readGameFile(void *dst, uint32 offs, uint32 size) {
-	_gameFile->seek(offs, SEEK_SET);
-	if (_gameFile->read(dst, size) != size)
-		error("readGameFile: Read failed (%d,%d)", offs, size);
-}
-
-// Thanks to Stuart Caie for providing the original
-// C conversion upon which this decruncher is based.
-
-#define SD_GETBIT(var) do {     \
-	if (!bits--) {              \
-		s -= 4;                 \
-		if (s < src)            \
-			return false;       \
-		bb = READ_BE_UINT32(s); \
-		bits = 31;              \
-	}                           \
-	(var) = bb & 1;             \
-	bb >>= 1;                   \
-}while (0)
-
-#define SD_GETBITS(var, nbits) do { \
-	bc = (nbits);                   \
-	(var) = 0;                      \
-	while (bc--) {                   \
-		(var) <<= 1;                \
-		SD_GETBIT(bit);             \
-		(var) |= bit;               \
-	}                               \
-}while (0)
-
-#define SD_TYPE_LITERAL (0)
-#define SD_TYPE_MATCH   (1)
-
-static bool decrunchFile(byte *src, byte *dst, uint32 size) {
-	byte *s = src + size - 4;
-	uint32 destlen = READ_BE_UINT32 (s);
-	uint32 bb, x, y;
-	byte *d = dst + destlen;
-	byte bc, bit, bits, type;
-
-	// Initialize bit buffer.
-	s -= 4;
-	bb = x = READ_BE_UINT32 (s);
-	bits = 0;
-	do {
-		x >>= 1;
-		bits++;
-	} while (x);
-	bits--;
-
-	while (d > dst) {
-		SD_GETBIT(x);
-		if (x) {
-			SD_GETBITS(x, 2);
-			switch (x) {
-			case 0:
-				type = SD_TYPE_MATCH;
-				x = 9;
-				y = 2;
-				break;
-
-			case 1:
-				type = SD_TYPE_MATCH;
-				x = 10;
-				y = 3;
-				break;
-
-			case 2:
-				type = SD_TYPE_MATCH;
-				x = 12;
-				SD_GETBITS(y, 8);
-				break;
-
-			default:
-				type = SD_TYPE_LITERAL;
-				x = 8;
-				y = 8;
-			}
-		} else {
-			SD_GETBIT(x);
-			if (x) {
-				type = SD_TYPE_MATCH;
-				x = 8;
-				y = 1;
-			} else {
-				type = SD_TYPE_LITERAL;
-				x = 3;
-				y = 0;
-			}
-		}
-
-		if (type == SD_TYPE_LITERAL) {
-			SD_GETBITS(x, x);
-			y += x;
-			if ((int)(y + 1) > (d - dst))
-				return false; // Overflow?
-			do {
-				SD_GETBITS(x, 8);
-				*--d = x;
-			} while (y-- > 0);
-		} else {
-			if ((int)(y + 1) > (d - dst))
-				return false; // Overflow?
-			SD_GETBITS(x, x);
-			if ((d + x) > (dst + destlen))
-				return false; // Offset overflow?
-			do {
-				d--;
-				*d = d[x];
-			} while (y-- > 0);
-		}
-	}
-
-	// Successful decrunch.
-	return true;
-}
-
-#undef SD_GETBIT
-#undef SD_GETBITS
-#undef SD_TYPE_LITERAL
-#undef SD_TYPE_MATCH
-
-void SimonEngine::loadSimonVGAFile(uint vga_id) {
-	uint32 offs, size;
-
-	if (getFeatures() & GF_OLD_BUNDLE) {
-		File in;
-		char filename[15];
-		if (vga_id == 23)
-			vga_id = 112;
-		if (vga_id == 328)
-			vga_id = 119;
-
-		if (getPlatform() == Common::kPlatformAmiga) {
-			if (getFeatures() & GF_TALKIE)
-				sprintf(filename, "0%d.out", vga_id);
-			else 
-				sprintf(filename, "0%d.pkd", vga_id);
-		} else {
-			sprintf(filename, "0%d.VGA", vga_id);
-		}
-
-		in.open(filename);
-		if (in.isOpen() == false)
-			error("loadSimonVGAFile: Can't load %s", filename);
-
-		size = in.size();
-		if (getFeatures() & GF_CRUNCHED) {
-			byte *srcBuffer = (byte *)malloc(size);
-			if (in.read(srcBuffer, size) != size)
-				error("loadSimonVGAFile: Read failed");
-			decrunchFile(srcBuffer, _vgaBufferPointers[11].vgaFile2, size);
-			free(srcBuffer);
-		} else {
-			if (in.read(_vgaBufferPointers[11].vgaFile2, size) != size)
-				error("loadSimonVGAFile: Read failed");
-		}
-		in.close();
-	} else {
-		offs = _gameOffsetsPtr[vga_id];
-
-		size = _gameOffsetsPtr[vga_id + 1] - offs;
-		readGameFile(_vgaBufferPointers[11].vgaFile2, offs, size);
-	}
-}
-
-byte *SimonEngine::loadVGAFile(uint id, uint type, uint32 &dstSize) {
-	File in;
-	char filename[15];
-	byte *dst = NULL;
-	uint32 file, offs, srcSize;
-	uint extraBuffer = 0;
-
-	if (getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2) {
-		// !!! HACK !!!
-		// Allocate more space for text to cope with foreign languages that use
-		// up more space than english. I hope 6400 bytes are enough. This number
-		// is base on: 2 (lines) * 320 (screen width) * 10 (textheight) -- olki
-		extraBuffer = (id == 5 ? 6400 : 0);
-	}
-
-	if (getFeatures() & GF_ZLIBCOMP) {
-		if (getPlatform() == Common::kPlatformAmiga) {
-			loadOffsets((const char*)"gfxindex.dat", id / 2 * 3 + type, file, offs, srcSize, dstSize);
-		} else {
-			loadOffsets((const char*)"graphics.vga", id / 2 * 3 + type, file, offs, srcSize, dstSize);
-		}
-
-		if (getPlatform() == Common::kPlatformAmiga)
-			sprintf(filename, "GFX%d.VGA", file);
-		else
-			sprintf(filename, "graphics.vga");
-
-		dst = allocBlock(dstSize + extraBuffer);
-		decompressData(filename, dst, offs, srcSize, dstSize);
-	} else if (getFeatures() & GF_OLD_BUNDLE) {
-		if (getPlatform() == Common::kPlatformAmiga) {
-			if (getFeatures() & GF_TALKIE)
-				sprintf(filename, "%.3d%d.out", id / 2, type);
-			else
-				sprintf(filename, "%.3d%d.pkd", id / 2, type);
-		} else {
-			if (getGameType() == GType_WW) {
-				sprintf(filename, "%.2d%d.VGA", id / 2, type);
-			} else {
-				sprintf(filename, "%.3d%d.VGA", id / 2, type);
-			}
-		}
-
-		in.open(filename);
-		if (in.isOpen() == false) {
-			if (type == 3) 
-				return NULL;
-			else
-				error("loadVGAFile: Can't load %s", filename);
-		}
-
-		dstSize = srcSize = in.size();
-		if (getFeatures() & GF_CRUNCHED) {
-			byte *srcBuffer = (byte *)malloc(srcSize);
-			if (in.read(srcBuffer, srcSize) != srcSize)
-				error("loadVGAFile: Read failed");
-
-			dstSize = READ_BE_UINT32(srcBuffer + srcSize - 4);
-			dst = allocBlock (dstSize + extraBuffer);
-			decrunchFile(srcBuffer, dst, srcSize);
-			free(srcBuffer);
-		} else {
-			dst = allocBlock(dstSize + extraBuffer);
-			if (in.read(dst, dstSize) != dstSize)
-				error("loadVGAFile: Read failed");
-		}
-		in.close();
-	} else {
-		offs = _gameOffsetsPtr[id];
-
-		dstSize = _gameOffsetsPtr[id + 1] - offs;
-		dst = allocBlock(dstSize + extraBuffer);
-		readGameFile(dst, offs, dstSize);
-	}
-
-	dstSize += extraBuffer;
-	return dst;
-}
-
-static const char *dimpSoundList[32] = {
-	"Beep",
-	"Birth",
-	"Boiling",
-	"Burp",
-	"Cough",
-	"Die1",
-	"Die2",
-	"Fart",
-	"Inject",
-	"Killchik",
-	"Puke",
-	"Lights",
-	"Shock",
-	"Snore",
-	"Snotty",
-	"Whip",
-	"Whistle",
-	"Work1",
-	"Work2",
-	"Yawn",
-	"And0w",
-	"And0x",
-	"And0y",
-	"And0z",
-	"And10",
-	"And11",
-	"And12",
-	"And13",
-	"And14",
-	"And15",
-	"And16",
-	"And17",
-};
-
-
-void SimonEngine::loadSound(uint sound, int pan, int vol, uint type) {
-	byte *dst;
-
-	if (getGameId() == GID_DIMP) {
-		File in;
-		char filename[15];
-
-		assert(sound >= 1 && sound <= 32);
-		sprintf(filename, "%s.wav", dimpSoundList[sound - 1]);
-
-		in.open(filename);
-		if (in.isOpen() == false)
-			error("loadSound: Can't load %s", filename);
-
-		uint32 dstSize = in.size();
-		dst = (byte *)malloc(dstSize);
-		if (in.read(dst, dstSize) != dstSize)
-			error("loadSound: Read failed");
-		in.close();
-	} else if (getFeatures() & GF_ZLIBCOMP) {
-		char filename[15];
-
-		uint32 file, offset, srcSize, dstSize;
-		if (getPlatform() == Common::kPlatformAmiga) {
-			loadOffsets((const char*)"sfxindex.dat", _zoneNumber * 22 + sound, file, offset, srcSize, dstSize);
-		} else {
-			loadOffsets((const char*)"effects.wav", _zoneNumber * 22 + sound, file, offset, srcSize, dstSize);
-		}
-
-		if (getPlatform() == Common::kPlatformAmiga)
-			sprintf(filename, "sfx%d.wav", file);
-		else
-			sprintf(filename, "effects.wav");
-
-		dst = (byte *)malloc(dstSize);
-		decompressData(filename, dst, offset, srcSize, dstSize);
-	} else {
-		if (!_curSfxFile)
-			error("loadSound: Can't load sound data file '%d3.VGA'", _zoneNumber);
-
-		dst = _curSfxFile + READ_LE_UINT32(_curSfxFile + sound * 4);
-	}
-
-	if (type == 3)
-		_sound->playSfx5Data(dst, sound, pan, vol);
-	else if (type == 2)
-		_sound->playAmbientData(dst, sound, pan, vol);
-	else
-		_sound->playSfxData(dst, sound, pan, vol);
-}
-
-void SimonEngine::loadVoice(uint speechId) {
-	if (getGameType() == GType_PP && speechId == 99)
-		return;
-
-	if (getFeatures() & GF_ZLIBCOMP) {
-		char filename[15];
-
-		uint32 file, offset, srcSize, dstSize;
-		if (getPlatform() == Common::kPlatformAmiga) {
-			loadOffsets((const char*)"spindex.dat", speechId, file, offset, srcSize, dstSize);
-		} else {
-			loadOffsets((const char*)"speech.wav", speechId, file, offset, srcSize, dstSize);
-		}
-
-		// Voice segment doesn't exist
-		if (offset == 0xFFFFFFFF && srcSize == 0xFFFFFFFF && dstSize == 0xFFFFFFFF) {
-			debug(0, "loadVoice: speechId %d removed", speechId);
-			return;
-		}
-
-		if (getPlatform() == Common::kPlatformAmiga)
-			sprintf(filename, "sp%d.wav", file);
-		else
-			sprintf(filename, "speech.wav");
-
-		byte *dst = (byte *)malloc(dstSize);
-		decompressData(filename, dst, offset, srcSize, dstSize);
-		_sound->playVoiceData(dst, speechId);
-	} else {
-		_sound->playVoice(speechId);
-	}
-}
-
-} // End of namespace Simon