- added detection of second demo version

- moved the resource entries tables to an external file (IGOR.TBL)
- added tool to build IGOR.TBL

svn-id: r29332

5 files changed, 59 insertions, 350 deletions

diff --git a/engines/igor/detection.cpp b/engines/igor/detection.cpp
index 05f5f9a3f9..7d73c53f74 100644
--- a/engines/igor/detection.cpp
+++ b/engines/igor/detection.cpp
@@ -31,12 +31,22 @@
 
 #include "igor/igor.h"
 
-static const PlainGameDescriptor igorGameDescriptor = {
-	"igor", "Igor: Objective Uikokahonia"
+struct GameDetectVersion {
+	uint32 borlandOverlaySize;
+	const char *versionString;
+};
+
+static const GameDetectVersion igorDetectVersionsTable[] = {
+	{ 4086790, " 1.00s" },
+	{ 4094103, " 1.10s" },
+	{ 0, 0 }
 };
 
 static const char *igorDetectFileName = "IGOR.DAT";
-static uint32 igorDetectFileSize = 4086790;
+
+static const PlainGameDescriptor igorGameDescriptor = {
+	"igor", "Igor: Objective Uikokahonia"
+};
 
 GameList Engine_IGOR_gameIDList() {
 	GameList games;
@@ -63,11 +73,18 @@ GameList Engine_IGOR_detectGames(const FSList &fslist) {
 				continue;
 			}
 			const uint32 sig = f.readUint32BE();
-			if (sig == MKID_BE('FBOV') && f.size() == igorDetectFileSize) {
-				GameDescriptor gd(igorGameDescriptor.gameid, igorGameDescriptor.description, Common::EN_ANY, Common::kPlatformPC);
-				gd.updateDesc("Demo");
-				detectedGames.push_back(gd);
-				break;
+			if (sig == MKID_BE('FBOV')) {
+				const uint32 fileSize = f.size();
+				for (int i = 0; igorDetectVersionsTable[i].borlandOverlaySize; ++i) {
+					if (igorDetectVersionsTable[i].borlandOverlaySize != fileSize) {
+						continue;
+					}
+					GameDescriptor gd(igorGameDescriptor.gameid, igorGameDescriptor.description, Common::EN_ANY, Common::kPlatformPC);
+					gd.description() += igorDetectVersionsTable[i].versionString;
+					gd.updateDesc("Demo");
+					detectedGames.push_back(gd);
+					break;
+				}
 			}
 		}
 	}
diff --git a/engines/igor/igor.cpp b/engines/igor/igor.cpp
index 68e6eb2002..580f8f6bd8 100644
--- a/engines/igor/igor.cpp
+++ b/engines/igor/igor.cpp
@@ -160,6 +160,7 @@ int IgorEngine::go() {
 	if (!_sndFile.open("IGOR.FSD")) {
 		error("Unable to open 'IGOR.FSD'");
 	}
+	readResourceEntriesTable();
 	loadMainTexts();
 	loadIgorFrames();
 	_gameState.talkMode = kTalkModeTextOnly;
@@ -169,9 +170,39 @@ int IgorEngine::go() {
 	PART_MAIN();
 	_ovlFile.close();
 	_sndFile.close();
+	delete[] _resourceEntriesTable;
 	return 0;
 }
 
+void IgorEngine::readResourceEntriesTable() {
+	Common::File f;
+	if (f.open("IGOR.TBL") && f.readUint32BE() == MKID_BE('ITBL') && f.readUint32BE() == 1) {
+		bool foundVersion = false;
+		uint32 borlandOverlaySize = _ovlFile.size();
+		int gameVersionsCount = f.readByte();
+		for (int i = 0; i < gameVersionsCount; ++i) {
+			uint32 size = f.readUint32BE();
+			uint32 offs = f.readUint32BE();
+			if (size == borlandOverlaySize) {
+				f.seek(offs);
+				foundVersion = true;
+				break;
+			}
+		}
+		assert(foundVersion);
+		_resourceEntriesCount = f.readUint16BE();
+		_resourceEntriesTable = new ResourceEntry[_resourceEntriesCount];
+		for (int i = 0; i < _resourceEntriesCount; ++i) {
+			ResourceEntry *re = &_resourceEntriesTable[i];
+			re->id = f.readUint16BE();
+			re->offs = f.readUint32BE();
+			re->size = f.readUint32BE();
+		}
+	} else {
+		error("Unable to open 'IGOR.TBL'");
+	}
+}
+
 void IgorEngine::waitForTimer(int ticks) {
 	_system->copyRectToScreen(_screenVGA, 320, 0, _screenVGAVOffset, 320, 200 - _screenVGAVOffset);
 	_system->updateScreen();
diff --git a/engines/igor/igor.h b/engines/igor/igor.h
index 06ae4856a8..af2dd1c7c7 100644
--- a/engines/igor/igor.h
+++ b/engines/igor/igor.h
@@ -273,6 +273,7 @@ public:
 	virtual int init();
 	virtual int go();
 
+	void readResourceEntriesTable();
 	void restart();
 	void waitForTimer(int ticks = -1);
 
@@ -460,8 +461,9 @@ protected:
 	UpdateDialogueProc _updateDialogue;
 	UpdateRoomBackgroundProc _updateRoomBackground;
 	int _gameTicks;
-
 	char _saveStateDescriptions[10][100];
+	ResourceEntry *_resourceEntriesTable;
+	int _resourceEntriesCount;
 
 	static const uint8 _dialogueColor[];
 	static const uint8 _sentenceColorIndex[];
@@ -478,8 +480,6 @@ protected:
 	static const uint8 _mouseCursorMask[];
 	static const uint8 _mouseCursorData[];
 	static const uint32 _fdsOffsetsTable[];
-	static const ResourceEntry _resourceEntriesTable[];
-	static const int _resourceEntriesCount;
 
 
 	//
diff --git a/engines/igor/resource_tbl.h b/engines/igor/resource_tbl.h
deleted file mode 100644
index b94036c9c8..0000000000
--- a/engines/igor/resource_tbl.h
+++ /dev/null
@@ -1,333 +0,0 @@
-{ FNT_Dialogue, 0xb09, 9306 },
-{ ANM_PhilipVodka, 0x300d, 24175 },
-{ AOF_PhilipVodka, 0x8e7c, 80 },
-{ TXT_PhilipRoom, 0x9580, 1164 },
-{ IMG_PhilipRoom, 0x9a0c, 46080 },
-{ PAL_PhilipRoom, 0x14e0c, 768 },
-{ MSK_PhilipRoom, 0x1510c, 3 },
-{ BOX_PhilipRoom, 0x1510f, 1280 },
-{ DAT_PhysicsClassroom, 0x18d44, 6017 },
-{ FRM_PhysicsClassroom1, 0x1a70d, 3100 },
-{ TXT_PhysicsClassroom, 0x1ba08, 1145 },
-{ IMG_PhysicsClassroom, 0x1be81, 46080 },
-{ PAL_PhysicsClassroom, 0x27281, 624 },
-{ MSK_PhysicsClassroom, 0x274f1, 1557 },
-{ BOX_PhysicsClassroom, 0x27b06, 1280 },
-{ DAT_ChemistryClassroom, 0x2b988, 6345 },
-{ FRM_ChemistryClassroom1, 0x2d4e1, 14 },
-{ FRM_ChemistryClassroom2, 0x2d4ef, 3332 },
-{ TXT_ChemistryClassroom, 0x2e8d6, 1226 },
-{ IMG_ChemistryClassroom, 0x2eda0, 46080 },
-{ PAL_ChemistryClassroom, 0x3a1a0, 624 },
-{ MSK_ChemistryClassroom, 0x3a410, 1980 },
-{ BOX_ChemistryClassroom, 0x3abcc, 1280 },
-{ DAT_CollegeStairsSecondFloor, 0x3f4bf, 6393 },
-{ FRM_CollegeStairsSecondFloor1, 0x410b8, 2756 },
-{ FRM_CollegeStairsSecondFloor2, 0x41b7c, 11136 },
-{ FRM_CollegeStairsSecondFloor3, 0x446fc, 6665 },
-{ TXT_CollegeStairsSecondFloor, 0x467ff, 1559 },
-{ IMG_CollegeStairsSecondFloor, 0x46e16, 46080 },
-{ PAL_CollegeStairsSecondFloor, 0x52216, 624 },
-{ MSK_CollegeStairsSecondFloor, 0x52486, 4128 },
-{ BOX_CollegeStairsSecondFloor, 0x534a6, 1280 },
-{ DAT_CollegeStairsFirstFloor, 0x579a5, 6017 },
-{ DLG_CollegeStairsFirstFloor, 0x5a3e8, 2713 },
-{ FRM_CollegeStairsFirstFloor1, 0x5af95, 48790 },
-{ FRM_CollegeStairsFirstFloor2, 0x66e2b, 140 },
-{ TXT_CollegeStairsFirstFloor, 0x675ad, 1228 },
-{ IMG_CollegeStairsFirstFloor, 0x67a79, 46080 },
-{ PAL_CollegeStairsFirstFloor, 0x72e79, 624 },
-{ MSK_CollegeStairsFirstFloor, 0x730e9, 2934 },
-{ BOX_CollegeStairsFirstFloor, 0x73c5f, 1280 },
-{ DAT_CollegeCorridorMissBarrymore, 0x77fa3, 6137 },
-{ FRM_CollegeCorridorMissBarrymore1, 0x79a88, 3250 },
-{ FRM_CollegeCorridorMissBarrymore2, 0x7a73a, 5280 },
-{ FRM_CollegeCorridorMissBarrymore3, 0x7bbda, 10824 },
-{ TXT_CollegeCorridorMissBarrymore, 0x7ed09, 1412 },
-{ IMG_CollegeCorridorMissBarrymore, 0x7f28d, 46080 },
-{ PAL_CollegeCorridorMissBarrymore, 0x8a68d, 624 },
-{ MSK_CollegeCorridorMissBarrymore, 0x8a8fd, 2484 },
-{ BOX_CollegeCorridorMissBarrymore, 0x8b2b1, 1280 },
-{ DAT_CollegeCorridorAnnouncementBoard, 0x8f34f, 5973 },
-{ FRM_CollegeCorridorAnnouncementBoard1, 0x90d44, 2392 },
-{ FRM_CollegeCorridorAnnouncementBoard2, 0x9169c, 6944 },
-{ TXT_CollegeCorridorAnnouncementBoard, 0x9389f, 1238 },
-{ IMG_CollegeCorridorAnnouncementBoard, 0x93d75, 46080 },
-{ PAL_CollegeCorridorAnnouncementBoard, 0x9f175, 624 },
-{ MSK_CollegeCorridorAnnouncementBoard, 0x9f3e5, 3117 },
-{ BOX_CollegeCorridorAnnouncementBoard, 0xa0012, 1280 },
-{ DAT_CollegeCorridorSharonMichael, 0xa3544, 5993 },
-{ FRM_CollegeCorridorSharonMichael1, 0xa4f4d, 3630 },
-{ FRM_CollegeCorridorSharonMichael2, 0xa5d7b, 7752 },
-{ FRM_CollegeCorridorSharonMichael3, 0xa7bc3, 5676 },
-{ FRM_CollegeCorridorSharonMichael4, 0xa91ef, 6762 },
-{ TXT_CollegeCorridorSharonMichael, 0xab344, 1387 },
-{ IMG_CollegeCorridorSharonMichael, 0xab8af, 46080 },
-{ PAL_CollegeCorridorSharonMichael, 0xb6caf, 624 },
-{ MSK_CollegeCorridorSharonMichael, 0xb6f1f, 3144 },
-{ BOX_CollegeCorridorSharonMichael, 0xb7b67, 1280 },
-{ DAT_CollegeCorridorCaroline, 0xbc49a, 6509 },
-{ FRM_CollegeCorridorCaroline1, 0xbe139, 25080 },
-{ FRM_CollegeCorridorCaroline3, 0xc4331, 7595 },
-{ FRM_CollegeCorridorCaroline2, 0xc60dc, 270 },
-{ TXT_CollegeCorridorCaroline, 0xc68e4, 2037 },
-{ IMG_CollegeCorridorCaroline, 0xc70d9, 46080 },
-{ PAL_CollegeCorridorCaroline, 0xd24d9, 624 },
-{ MSK_CollegeCorridorCaroline, 0xd2749, 2151 },
-{ BOX_CollegeCorridorCaroline, 0xd2fb0, 1280 },
-{ DAT_CollegeCorridorLucas, 0xd6381, 6109 },
-{ FRM_CollegeCorridorLucas1, 0xd7df4, 2592 },
-{ FRM_CollegeCorridorLucas2, 0xd8814, 1225 },
-{ FRM_CollegeCorridorLucas3, 0xd8cdd, 6480 },
-{ FRM_CollegeCorridorLucas4, 0xda62d, 1140 },
-{ TXT_CollegeCorridorLucas, 0xdb18c, 1387 },
-{ IMG_CollegeCorridorLucas, 0xdb6f7, 46080 },
-{ PAL_CollegeCorridorLucas, 0xe6af7, 624 },
-{ MSK_CollegeCorridorLucas, 0xe6d67, 3297 },
-{ BOX_CollegeCorridorLucas, 0xe7a48, 1280 },
-{ DAT_CollegeCorridorMargaret, 0xeb74f, 6273 },
-{ DLG_CollegeCorridorMargaret, 0xee325, 6860 },
-{ FRM_CollegeCorridorMargaret1, 0xeff79, 5346 },
-{ FRM_CollegeCorridorMargaret2, 0xf145b, 44247 },
-{ FRM_CollegeCorridorMargaret3, 0xfc132, 7800 },
-{ FRM_CollegeCorridorMargaret4, 0xfdfaa, 3564 },
-{ TXT_CollegeCorridorMargaret, 0xff494, 1642 },
-{ IMG_CollegeCorridorMargaret, 0xffafe, 46080 },
-{ PAL_CollegeCorridorMargaret, 0x10aefe, 624 },
-{ MSK_CollegeCorridorMargaret, 0x10b16e, 3690 },
-{ BOX_CollegeCorridorMargaret, 0x10bfd8, 1280 },
-{ DAT_CollegeLockers, 0x10f230, 6437 },
-{ FRM_CollegeLockers1, 0x110dcb, 2496 },
-{ FRM_CollegeLockers2, 0x11178b, 4704 },
-{ FRM_CollegeLockers3, 0x1129eb, 1260 },
-{ TXT_CollegeLockers, 0x1135be, 1812 },
-{ IMG_CollegeLockers, 0x113cd2, 46080 },
-{ PAL_CollegeLockers, 0x11f0d2, 624 },
-{ MSK_CollegeLockers, 0x11f342, 2235 },
-{ BOX_CollegeLockers, 0x11fbfd, 1280 },
-{ DAT_MenToilets, 0x123cd7, 6465 },
-{ DAT_WomenToilets, 0x129cd1, 6385 },
-{ FRM_WomenToilets1, 0x12b96a, 854 },
-{ FRM_WomenToilets2, 0x12bcc0, 12 },
-{ FRM_WomenToilets3, 0x12bccc, 2744 },
-{ FRM_WomenToilets4, 0x12c784, 12855 },
-{ FRM_WomenToilets5, 0x12f9bb, 102 },
-{ TXT_WomenToilets, 0x130110, 1637 },
-{ IMG_WomenToilets, 0x130775, 46080 },
-{ PAL_WomenToilets, 0x13bb75, 624 },
-{ MSK_WomenToilets, 0x13bde5, 2022 },
-{ BOX_WomenToilets, 0x13c5cb, 1280 },
-{ FRM_MenToilets1, 0x13cb79, 3038 },
-{ FRM_MenToilets2, 0x13d757, 1624 },
-{ TXT_MenToilets, 0x13e492, 1322 },
-{ IMG_MenToilets, 0x13e9bc, 46080 },
-{ PAL_MenToilets, 0x149dbc, 624 },
-{ MSK_MenToilets, 0x14a02c, 1980 },
-{ BOX_MenToilets, 0x14a7e8, 1280 },
-{ DAT_OutsideCollege, 0x14fe08, 6777 },
-{ DLG_OutsideCollege, 0x152677, 953 },
-{ FRM_OutsideCollege1, 0x152bb8, 2156 },
-{ FRM_OutsideCollege2, 0x153424, 4347 },
-{ FRM_OutsideCollege3, 0x15451f, 693 },
-{ FRM_OutsideCollege4, 0x1547d4, 594 },
-{ FRM_OutsideCollege5, 0x154a26, 10080 },
-{ TXT_OutsideCollege, 0x157875, 1741 },
-{ IMG_OutsideCollege, 0x157f42, 46080 },
-{ PAL_OutsideCollege, 0x163342, 624 },
-{ MSK_OutsideCollege, 0x1635b2, 4974 },
-{ BOX_OutsideCollege, 0x164920, 1280 },
-{ DAT_Laboratory, 0x168d8d, 5645 },
-{ FRM_Laboratory1, 0x16a6a2, 2254 },
-{ FRM_Laboratory2, 0x16af70, 26218 },
-{ FRM_Laboratory3, 0x1715da, 128 },
-{ TXT_Laboratory, 0x171d41, 1527 },
-{ IMG_Laboratory, 0x172338, 46080 },
-{ PAL_Laboratory, 0x17d738, 624 },
-{ MSK_Laboratory, 0x17d9a8, 2130 },
-{ BOX_Laboratory, 0x17e1fa, 1280 },
-{ FRM_MargaretRoom1, 0x181864, 10853 },
-{ FRM_MargaretRoom2, 0x1842c9, 16 },
-{ FRM_MargaretRoom3, 0x1842d9, 44564 },
-{ FRM_MargaretRoom4, 0x18f0ed, 80 },
-{ TXT_MargaretRoom, 0x18f7f9, 1707 },
-{ IMG_MargaretRoom, 0x18fea4, 46080 },
-{ PAL_MargaretRoom, 0x19b2a4, 768 },
-{ MSK_MargaretRoom, 0x19b5a4, 3 },
-{ BOX_MargaretRoom, 0x19b5a7, 1280 },
-{ DAT_Map, 0x19e0b8, 6273 },
-{ TXT_Map, 0x1a0184, 1023 },
-{ IMG_Map, 0x1a0583, 46080 },
-{ PAL_Map, 0x1ab983, 624 },
-{ MSK_Map, 0x1abbf3, 1809 },
-{ BOX_Map, 0x1ac304, 1280 },
-{ DAT_TobiasOffice, 0x1b0072, 5945 },
-{ DLG_TobiasOffice, 0x1b2ab1, 10590 },
-{ ANM_TobiasOffice1, 0x1b5595, 2392 },
-{ AOF_TobiasOffice1, 0x1b5eed, 910 },
-{ ANM_TobiasOffice2, 0x1b627b, 16992 },
-{ AOF_TobiasOffice2, 0x1ba4db, 6678 },
-{ TXT_TobiasOffice, 0x1bc5dc, 2086 },
-{ IMG_TobiasOffice, 0x1bce02, 46080 },
-{ PAL_TobiasOffice, 0x1c8202, 624 },
-{ MSK_TobiasOffice, 0x1c8472, 1455 },
-{ BOX_TobiasOffice, 0x1c8a21, 1280 },
-{ DAT_BellChurch, 0x1cb75d, 5617 },
-{ FRM_BellChurch1, 0x1ccf40, 42240 },
-{ FRM_BellChurch2, 0x1d6f40, 2100 },
-{ TXT_BellChurch, 0x1d7e57, 1158 },
-{ IMG_BellChurch, 0x1d82dd, 46080 },
-{ PAL_BellChurch, 0x1e36dd, 624 },
-{ MSK_BellChurch, 0x1e394d, 861 },
-{ BOX_BellChurch, 0x1e3caa, 1280 },
-{ DAT_ChurchPuzzle, 0x1e8cb7, 6137 },
-{ IMG_ChurchMosaic, 0x1eb513, 46080 },
-{ PAL_ChurchMosaic, 0x1f6913, 720 },
-{ MSK_ChurchMosaic, 0x1f6be3, 2445 },
-{ FRM_ChurchPuzzle1, 0x1f7862, 980 },
-{ FRM_ChurchPuzzle2, 0x1f7c36, 945 },
-{ FRM_ChurchPuzzle3, 0x1f7fe7, 1794 },
-{ FRM_ChurchPuzzle13, 0x1f86e9, 2240 },
-{ FRM_ChurchPuzzle4, 0x1f8fa9, 2106 },
-{ FRM_ChurchPuzzle5, 0x1f97e3, 1260 },
-{ FRM_ChurchPuzzle6, 0x1f9ccf, 1036 },
-{ FRM_ChurchPuzzle7, 0x1fa0db, 1053 },
-{ FRM_ChurchPuzzle8, 0x1fa4f8, 6 },
-{ FRM_ChurchPuzzle9, 0x1fa4fe, 26980 },
-{ FRM_ChurchPuzzle10, 0x200e62, 120 },
-{ FRM_ChurchPuzzle11, 0x200eda, 11607 },
-{ FRM_ChurchPuzzle12, 0x203c31, 20 },
-{ FRM_ChurchPuzzle14, 0x203c45, 2904 },
-{ TXT_ChurchPuzzle, 0x204eb0, 1587 },
-{ IMG_ChurchPuzzle, 0x2054e3, 46080 },
-{ PAL_ChurchPuzzle, 0x2108e3, 624 },
-{ MSK_ChurchPuzzle, 0x210b53, 1992 },
-{ BOX_ChurchPuzzle, 0x21131b, 1280 },
-{ DAT_InsideChurch, 0x2151fd, 5973 },
-{ TXT_InsideChurch, 0x217231, 1070 },
-{ IMG_InsideChurch, 0x21765f, 46080 },
-{ PAL_InsideChurch, 0x222a5f, 624 },
-{ MSK_InsideChurch, 0x222ccf, 2352 },
-{ BOX_InsideChurch, 0x2235ff, 1280 },
-{ DAT_OutsideChurch, 0x228b56, 6017 },
-{ DLG_OutsideChurch, 0x22b768, 5130 },
-{ FRM_OutsideChurch8, 0x22ceb2, 27365 },
-{ FRM_OutsideChurch9, 0x233997, 58 },
-{ FRM_OutsideChurch1, 0x2339d1, 1869 },
-{ FRM_OutsideChurch2, 0x23411e, 20 },
-{ FRM_OutsideChurch3, 0x234132, 2472 },
-{ FRM_OutsideChurch4, 0x234ada, 16 },
-{ FRM_OutsideChurch5, 0x234aea, 5147 },
-{ FRM_OutsideChurch6, 0x235f05, 14 },
-{ FRM_OutsideChurch7, 0x235f13, 5145 },
-{ FRM_OutsideChurch10, 0x23732c, 6805 },
-{ FRM_OutsideChurch11, 0x238dc1, 14 },
-{ FRM_OutsideChurch12, 0x238dcf, 5145 },
-{ TXT_OutsideChurch, 0x23a8bc, 1427 },
-{ IMG_OutsideChurch, 0x23ae4f, 46080 },
-{ PAL_OutsideChurch, 0x24624f, 624 },
-{ MSK_OutsideChurch, 0x2464bf, 3264 },
-{ BOX_OutsideChurch, 0x24717f, 1280 },
-{ DAT_SpringBridge, 0x24bdb6, 6017 },
-{ WLK_Bridge1, 0x24d537, 134 },
-{ WLK_Bridge2, 0x24d5bd, 2546 },
-{ DLG_SpringPhotographer, 0x24f896, 15460 },
-{ DAT_SpringRock, 0x257596, 6195 },
-{ WLK_Bridge3, 0x258dc9, 134 },
-{ WLK_Bridge4, 0x258e4f, 2546 },
-{ FRM_SpringRock1, 0x259bc1, 84 },
-{ FRM_SpringRock2, 0x259c15, 759 },
-{ FRM_SpringRock3, 0x259f0c, 5145 },
-{ FRM_SpringRock4, 0x25b325, 4508 },
-{ FRM_SpringRock5, 0x25c4c1, 13364 },
-{ FRM_SpringRock6, 0x25f8f5, 54 },
-{ FRM_SpringBridge1, 0x25f9b9, 24 },
-{ FRM_SpringBridge2, 0x25f9d1, 4410 },
-{ TXT_SpringBridge, 0x2611ee, 1071 },
-{ IMG_SpringBridge, 0x26161d, 46080 },
-{ PAL_SpringBridge, 0x26ca1d, 720 },
-{ MSK_SpringBridge, 0x26cced, 3936 },
-{ BOX_SpringBridge, 0x26dc4d, 1280 },
-{ DAT_Library, 0x272a7f, 7325 },
-{ DLG_Library, 0x275c55, 3573 },
-{ FRM_Library1, 0x276c08, 2254 },
-{ FRM_Library2, 0x2774d6, 18823 },
-{ FRM_Library3, 0x27be5d, 50 },
-{ FRM_Library4, 0x27be8f, 1440 },
-{ FRM_Library5, 0x27c42f, 14616 },
-{ TXT_Library2, 0x27ffad, 237 },
-{ TXT_Library, 0x280794, 2024 },
-{ IMG_Library, 0x280f7c, 46080 },
-{ PAL_Library, 0x28c37c, 624 },
-{ MSK_Library, 0x28c5ec, 2217 },
-{ BOX_Library, 0x28ce95, 1280 },
-{ ANM_PhilipLauraIntro, 0x28e5ac, 29824 },
-{ AOF_PhilipLauraIntro, 0x295a2c, 74 },
-{ ANM_LauraIntro, 0x295a76, 12793 },
-{ AOF_LauraIntro, 0x298c6f, 48 },
-{ TXT_SpringBridgeIntro, 0x299249, 1846 },
-{ IMG_SpringBridgeIntro, 0x29997f, 46080 },
-{ PAL_SpringBridgeIntro, 0x2a4d7f, 720 },
-{ TXT_SpringRock, 0x2a5756, 1374 },
-{ IMG_SpringRock, 0x2a5cb4, 46080 },
-{ PAL_SpringRock, 0x2b10b4, 720 },
-{ MSK_SpringRock, 0x2b1384, 3117 },
-{ BOX_SpringRock, 0x2b1fb1, 1280 },
-{ PAL_Shareware7, 0x2b2790, 768 },
-{ IMG_Shareware7, 0x2b2a90, 46080 },
-{ PAL_Shareware6, 0x2bdf09, 768 },
-{ IMG_Shareware6, 0x2be209, 46080 },
-{ PAL_Shareware5, 0x2c9682, 768 },
-{ IMG_Shareware5, 0x2c9982, 46080 },
-{ PAL_Shareware4, 0x2d4dfb, 768 },
-{ IMG_Shareware4, 0x2d50fb, 46080 },
-{ PAL_Shareware3, 0x2e0574, 768 },
-{ IMG_Shareware3, 0x2e0874, 46080 },
-{ PAL_Shareware2, 0x2ebced, 768 },
-{ IMG_Shareware2, 0x2ebfed, 46080 },
-{ PAL_Shareware1, 0x2f7466, 768 },
-{ IMG_Shareware1, 0x2f7766, 46080 },
-{ PAL_TitleScreen, 0x302ec8, 768 },
-{ IMG_TitleScreen, 0x3031c8, 64000 },
-{ PAL_PenduloStudios, 0x312c40, 768 },
-{ IMG_PenduloStudios, 0x312f40, 64000 },
-{ PAL_GraphicAdventure, 0x3229b8, 768 },
-{ IMG_GraphicAdventure, 0x322cb8, 64000 },
-{ PAL_Presents, 0x332730, 768 },
-{ IMG_Presents, 0x332a30, 64000 },
-{ PAL_OptikSoftware, 0x3424a8, 768 },
-{ IMG_OptikSoftware, 0x3427a8, 64000 },
-{ IMG_Meanwhile, 0x352279, 46080 },
-{ IMG_OptionsButton, 0x36b111, 2106 },
-{ IMG_OptionsMenu, 0x36b94b, 36800 },
-{ CMF_8, 0x374cfc, 4926 },
-{ CMF_9, 0x37603a, 6249 },
-{ CMF_10, 0x3778a3, 5982 },
-{ CMF_11, 0x379001, 12793 },
-{ CMF_12, 0x37c1fa, 22275 },
-{ CMF_2_1, 0x381b77, 4111 },
-{ CMF_2_2, 0x382b86, 4303 },
-{ CMF_2_3, 0x383c55, 4343 },
-{ CMF_2_4, 0x384d4c, 5943 },
-{ CMF_3, 0x386483, 5898 },
-{ CMF_4, 0x387b8d, 3133 },
-{ CMF_7_1, 0x3887ca, 4671 },
-{ CMF_7_2, 0x389a09, 646 },
-{ CMF_7_3, 0x389c8f, 2014 },
-{ CMF_7_4, 0x38a46d, 1369 },
-{ FRM_IgorDirBack, 0x38abb8, 10500 },
-{ FRM_IgorDirRight, 0x38d4bc, 13500 },
-{ FRM_IgorDirFront, 0x390978, 10500 },
-{ FRM_IgorDirLeft, 0x39327c, 13500 },
-{ FRM_IgorHead, 0x396738, 3696 },
-{ IMG_VerbsPanel, 0x39fd50, 3840 },
-{ TXT_MainTable, 0x3a0c50, 28028 },
-{ IMG_RomanNumbersPaper, 0x3a7e14, 46080 },
-{ PAL_RomanNumbersPaper, 0x3b3214, 624 },
-{ FRM_NumbersPaper1, 0x3b36ae, 51163 },
-{ FRM_NumbersPaper2, 0x3bfe89, 40 },
-{ IMG_NewsPaper, 0x3c017f, 46080 },
-{ PAL_NewsPaper, 0x3cb57f, 624 },
-{ IMG_PhotoHarrisonMargaret, 0x3cbcf9, 46080 },
-{ PAL_PhotoHarrisonMargaret, 0x3d70f9, 624 },
-{ IMG_InventoryPanel, 0x3d7a76, 9600 },
-{ IMG_Objects, 0x3d9ff6, 48000 },
diff --git a/engines/igor/staticres.cpp b/engines/igor/staticres.cpp
index aeb0cfb88f..31761ebccf 100644
--- a/engines/igor/staticres.cpp
+++ b/engines/igor/staticres.cpp
@@ -915,12 +915,6 @@ const uint32 IgorEngine::_fdsOffsetsTable[] = {
 	0x06202C, 0x06202D, 0x06202E, 0x06202F, 0x062030, 0x062031, 0x070CB2
 };
 
-const ResourceEntry IgorEngine::_resourceEntriesTable[] = {
-#include "resource_tbl.h"
-};
-
-const int IgorEngine::_resourceEntriesCount = ARRAYSIZE(_resourceEntriesTable);
-
 const uint8 IgorEngine::PAL_48_1[] = {
 	0x2D, 0x16, 0x00, 0x3D, 0x26, 0x01, 0x32, 0x32, 0x24, 0x16, 0x1D, 0x16, 0x12, 0x19, 0x12, 0x0B,
 	0x12, 0x0B, 0x32, 0x32, 0x24, 0x16, 0x1D, 0x16, 0x12, 0x19, 0x12, 0x0B, 0x12, 0x0B, 0x3D, 0x3D,