sync'ing with local tree for now

- some minor changes to detection code
- added missing spanish strings to IGOR.TBL
- fixed '@' charset index

svn-id: r29672

3 files changed, 130 insertions, 55 deletions

diff --git a/tools/create_igortbl/create_igortbl.c b/tools/create_igortbl/create_igortbl.c
index e5225c9bfb..060643a023 100644
--- a/tools/create_igortbl/create_igortbl.c
+++ b/tools/create_igortbl/create_igortbl.c
@@ -119,7 +119,7 @@ static const struct GameVersion _gameVersions[] = {
 };
 
 static const uint32 ITBL_TAG = 0x4954424C;
-static const uint32 CURRENT_VERSION = 3;
+static const uint32 CURRENT_VERSION = 4;
 static const uint32 DEFAULT_OFFSET = 0x12345678;
 
 struct TablePtrOffset {
diff --git a/tools/create_igortbl/resource_sp_cdrom.h b/tools/create_igortbl/resource_sp_cdrom.h
index 80e2cbcda9..1f3f8b2511 100644
--- a/tools/create_igortbl/resource_sp_cdrom.h
+++ b/tools/create_igortbl/resource_sp_cdrom.h
@@ -20,8 +20,19 @@
 { PAL_ChemistryClassroom, 0x3c4573, 624 },
 { MSK_ChemistryClassroom, 0x3c47e3, 1980 },
 { BOX_ChemistryClassroom, 0x3c4f9f, 1280 },
+{ DAT_ParkRight, 0x3c7add, 6133 },
+{ DAT_ParkLeft, 0x3cdf98, 5969 },
 { FRM_MenToilets1, 0x3d4159, 3038 },
 { FRM_MenToilets2, 0x3d4d37, 1624 },
+{ FRM_Park1, 0x3ed1d9, 30376 },
+{ FRM_Park2, 0x3f4881, 62 },
+{ FRM_Park3, 0x3f48bf, 3969 },
+{ FRM_Park4, 0x3f5840, 3150 },
+{ TXT_Park, 0x3f6ba2, 1691 },
+{ IMG_Park, 0x3f723d, 46080 },
+{ PAL_Park, 0x40263d, 624 },
+{ MSK_Park, 0x4028ad, 4728 },
+{ BOX_Park, 0x403b25, 1280 },
 { DAT_CollegeStairsSecondFloor, 0x407c47, 6393 },
 { FRM_CollegeStairsSecondFloor1, 0x40b7a3, 2756 },
 { FRM_CollegeStairsSecondFloor2, 0x40c267, 11136 },
@@ -172,6 +183,12 @@
 { PAL_BellChurch, 0x5d9224, 624 },
 { MSK_BellChurch, 0x5d9494, 861 },
 { BOX_BellChurch, 0x5d97f1, 1280 },
+{ DAT_OutsideAdministrationBuilding, 0x67949c, 6345 },
+{ FRM_OutsideAdministrationBuilding1, 0x683f0d, 2058 },
+{ FRM_OutsideAdministrationBuilding2, 0x684717, 2520 },
+{ FRM_OutsideAdministrationBuilding3, 0x6850ef, 420 },
+{ FRM_OutsideAdministrationBuilding4, 0x685293, 296 },
+{ FRM_OutsideAdministrationBuilding5, 0x6853bb, 2520 },
 { DAT_SpringBridge, 0x6a54a6, 6017 },
 { WLK_Bridge1, 0x6a83a8, 134 },
 { WLK_Bridge2, 0x6a842e, 2546 },
@@ -189,6 +206,40 @@
 { PAL_SpringBridge, 0x6cc2da, 624 },
 { MSK_SpringBridge, 0x6cc5aa, 3936 },
 { BOX_SpringBridge, 0x6cd50a, 1280 },
+{ DAT_DeanPepperOffice, 0x6f3a2e, 6417 },
+{ DAT_AdministrationSecretaryRoom, 0x6fb56a, 6417 },
+{ TXT_AdministrationSecretaryRoom, 0x713da2, 1624 },
+{ IMG_AdministrationSecretaryRoom, 0x7143fa, 46080 },
+{ PAL_AdministrationSecretaryRoom, 0x71f7fa, 624 },
+{ MSK_AdministrationSecretaryRoom, 0x71fa6a, 2400 },
+{ BOX_AdministrationSecretaryRoom, 0x7203ca, 1280 },
+{ FRM_DeanPepperOffice1, 0x729b38, 2448 },
+{ FRM_DeanPepperOffice2, 0x72a4c8, 2254 },
+{ FRM_DeanPepperOffice3, 0x72ad96, 2744 },
+{ FRM_DeanPepperOffice4, 0x72b84e, 2652 },
+{ FRM_DeanPepperOffice5, 0x72c2aa, 2842 },
+{ FRM_DeanPepperOffice6, 0x72cdc4, 2842 },
+{ FRM_DeanPepperOffice7, 0x72d8de, 4293 },
+{ FRM_DeanPepperOffice8, 0x72e9a3, 3850 },
+{ FRM_DeanPepperOffice9, 0x72f8ad, 4704 },
+{ FRM_DeanPepperOffice10, 0x730b0d, 1800 },
+{ FRM_DeanPepperOffice11, 0x731215, 3480 },
+{ FRM_DeanPepperOffice12, 0x731fad, 20 },
+{ FRM_DeanPepperOffice13, 0x731fc1, 5075 },
+{ FRM_DeanPepperOffice14, 0x733394, 620 },
+{ FRM_DeanPepperOffice15, 0x733600, 18298 },
+{ FRM_DeanPepperOffice16, 0x737d7a, 38 },
+{ TXT_DeanPepperOffice, 0x7385a2, 1708 },
+{ IMG_DeanPepperOffice, 0x738c4e, 46080 },
+{ PAL_DeanPepperOffice, 0x74404e, 624 },
+{ MSK_DeanPepperOffice, 0x7442be, 2745 },
+{ BOX_DeanPepperOffice, 0x744d77, 1280 },
+{ DAT_StudentDormitoryRoom, 0x7a446d, 6673 },
+{ TXT_StudentDormitoryRoom, 0x7b18a2, 1476 },
+{ IMG_StudentDormitoryRoom, 0x7b1e66, 46080 },
+{ PAL_StudentDormitoryRoom, 0x7bd266, 624 },
+{ MSK_StudentDormitoryRoom, 0x7bd566, 6699 },
+{ BOX_StudentDormitoryRoom, 0x7bef91, 1280 },
 { ANM_PhilipLauraIntro, 0x7cb4d4, 29824 },
 { AOF_PhilipLauraIntro, 0x7d2954, 74 },
 { ANM_LauraIntro, 0x7d299e, 12793 },
diff --git a/tools/create_igortbl/strings.h b/tools/create_igortbl/strings.h
index 86edd881d6..d42ac1eb2b 100644
--- a/tools/create_igortbl/strings.h
+++ b/tools/create_igortbl/strings.h
@@ -1,54 +1,78 @@
-{ STR_COPYRIGHT_1995, STR_LANG_ANY, "(C) 1995 Optik Software. All rights reserved." },
-{ STR_COPYRIGHT_1994, STR_LANG_ANY, "(C) 1994 PENDULO STUDIOS. All rights reserved." },
-{ STR_BOTTLE_OF_WHISKY, STR_LANG_ENG, " bottle of whisky" },
-{ STR_EMPTY_BOTTLE, STR_LANG_ENG, " empty bottle" },
-{ STR_BOTTLE_OF_WATER, STR_LANG_ENG, " bottle of water" },
-{ STR_LIZARD, STR_LANG_ENG, " lizard" },
-{ STR_FAT_LIZARD, STR_LANG_ENG, " fat lizard" },
-{ STR_CAROLINE_FOLDER, STR_LANG_ENG, " Caroline%s folder" },
-{ STR_PHILIP_FOLDER, STR_LANG_ENG, " Philip%s folder" },
-{ STR_STATUETTE, STR_LANG_ENG, " statuette" },
-{ STR_REWARD, STR_LANG_ENG, " reward" },
-
-{ STR_IGOR_OBJECTIVE_UIKOKAHONIA, STR_LANG_ENG, "\"Igor. Objective Uikokahonia\"" },
-{ STR_SHAREWARE_VERSION, STR_LANG_ENG, "Shareware version" },
-{ STR_SHAREWARE_PLACE_ORDER, STR_LANG_ENG, "To place an order: 1-800-OPTIK-99" },
-
-{ STR_SHAREWARE_TEXT1, STR_LANG_ENG, "This is SHAREWARE!" },
-{ STR_SHAREWARE_TEXT2, STR_LANG_ENG, "You can copy this version!" },
-{ STR_SHAREWARE_TEXT3, STR_LANG_ENG, "Pass it around, give it to your friends, family," },
-{ STR_SHAREWARE_TEXT4, STR_LANG_ENG, "colleagues and upload it to your favorite BBS." },
-{ STR_SHAREWARE_TEXT5, STR_LANG_ENG, "Let everyone enjoy IGOR!" },
-
-{ STR_SHAREWARE_ORDER_1, STR_LANG_ENG, "Order the full IGOR game for only $34.99 US." },
-{ STR_SHAREWARE_ORDER_2, STR_LANG_ENG, "$5.00 for shipping and handling (US & CANADA)." },
-{ STR_SHAREWARE_ORDER_3, STR_LANG_ENG, "Please add $3.00 for international shipping." },
-{ STR_SHAREWARE_ORDER_4, STR_LANG_ENG, "To place an order: 1-800-OPTIK-99" },
-
-{ STR_SHAREWARE_SHIPPING_1, STR_LANG_ENG, "90 day limited warranty." },
-{ STR_SHAREWARE_SHIPPING_2, STR_LANG_ENG, "Please allow 2-4 days for delivery (US only)." },
-{ STR_SHAREWARE_SHIPPING_3, STR_LANG_ENG, "Elsewhere, up to a week or two..." },
-{ STR_SHAREWARE_SHIPPING_4, STR_LANG_ENG, "Overnight/second day shipping available an" },
-{ STR_SHAREWARE_SHIPPING_5, STR_LANG_ENG, "aditional change. Please call for exact pricing." },
-{ STR_SHAREWARE_SHIPPING_6, STR_LANG_ENG, "Three easy ways to order:" },
-{ STR_SHAREWARE_SHIPPING_7, STR_LANG_ENG, "- Call 1-800-678-4599 (orders only) and use" },
-{ STR_SHAREWARE_SHIPPING_8, STR_LANG_ENG, "Your Visa, Mastercard or Discover card." },
-{ STR_SHAREWARE_SHIPPING_9, STR_LANG_ENG, "- Fax your order (please include credit card" },
-{ STR_SHAREWARE_SHIPPING_10, STR_LANG_ENG, "information) to (412) 381-1031" },
-
-{ STR_SHAREWARE_OPTIK_ADDRESS_1, STR_LANG_ENG, "- Mail a check or money order to:" },
-{ STR_SHAREWARE_OPTIK_ADDRESS_2, STR_LANG_ENG, "Optik Software Inc." },
-{ STR_SHAREWARE_OPTIK_ADDRESS_3, STR_LANG_ENG, "1000 Napor Boulevard" },
-{ STR_SHAREWARE_OPTIK_ADDRESS_4, STR_LANG_ENG, "Pittsburgh, PA. 15205" },
-{ STR_SHAREWARE_OPTIK_ADDRESS_5, STR_LANG_ENG, "USA" },
-{ STR_SHAREWARE_OPTIK_ADDRESS_6, STR_LANG_ENG, "Optik Software Inc." },
-{ STR_SHAREWARE_OPTIK_ADDRESS_7, STR_LANG_ENG, "Orders only: 1-800-OPTIK-99 (67845-99)" },
-{ STR_SHAREWARE_OPTIK_ADDRESS_8, STR_LANG_ENG, "Fax: (412) 381-1031" },
-{ STR_SHAREWARE_OPTIK_ADDRESS_9, STR_LANG_ENG, "E-mail: optiksoft\xFA""aol.com" },
-
-{ STR_SHAREWARE_PENDULO_ADDRESS_1, STR_LANG_ENG, "A game by" },
-{ STR_SHAREWARE_PENDULO_ADDRESS_2, STR_LANG_ENG, "PENDULO STUDIOS" },
-{ STR_SHAREWARE_PENDULO_ADDRESS_3, STR_LANG_ENG, "P.O. Box 21091" },
-{ STR_SHAREWARE_PENDULO_ADDRESS_4, STR_LANG_ENG, "28009 Madrid" },
-{ STR_SHAREWARE_PENDULO_ADDRESS_5, STR_LANG_ENG, "Spain" },
-{ STR_SHAREWARE_PENDULO_ADDRESS_6, STR_LANG_ENG, "E-mail: 100641.1737\xFA""compuserve.com" },
+{ STR_Copyright1995, STR_LANG_ANY, "(C) 1995 Optik Software. All rights reserved." },
+{ STR_Copyright1994, STR_LANG_ANY, "(C) 1994 PENDULO STUDIOS. All rights reserved." },
+
+{ STR_BottleOfWhisky, STR_LANG_ENG, " bottle of whisky" },
+{ STR_EmptyBottle, STR_LANG_ENG, " empty bottle" },
+{ STR_BottleOfWater, STR_LANG_ENG, " bottle of water" },
+{ STR_Lizard, STR_LANG_ENG, " lizard" },
+{ STR_FatLizard, STR_LANG_ENG, " fat lizard" },
+{ STR_CarolineFolder, STR_LANG_ENG, " Caroline%s folder" },
+{ STR_PhilipFolder, STR_LANG_ENG, " Philip%s folder" },
+{ STR_Statuette, STR_LANG_ENG, " statuette" },
+{ STR_Reward, STR_LANG_ENG, " reward" },
+
+{ STR_BottleOfWhisky, STR_LANG_SPA, " botella de whisky" },
+{ STR_EmptyBottle, STR_LANG_SPA, " botella vacía" },
+{ STR_BottleOfWater, STR_LANG_SPA, " botella con agua" },
+{ STR_Lizard, STR_LANG_SPA, " lagarto" },
+{ STR_FatLizard, STR_LANG_SPA, " lagarto cebado" },
+{ STR_CarolineFolder, STR_LANG_SPA, " carpeta de Caroline" },
+{ STR_PhilipFolder, STR_LANG_SPA, " carpeta de Philip" },
+{ STR_Statuette, STR_LANG_SPA, " estatuilla" },
+{ STR_Reward, STR_LANG_SPA, " recompensa" },
+
+{ STR_Talk, STR_LANG_SPA, "Hablar" },
+{ STR_Take, STR_LANG_SPA, "Coger" },
+{ STR_Look, STR_LANG_SPA, "Mirar" },
+{ STR_Use, STR_LANG_SPA, "Usar" },
+{ STR_Open, STR_LANG_SPA, "Abrir" },
+{ STR_Close, STR_LANG_SPA, "Cerrar" },
+{ STR_Give, STR_LANG_SPA, "Dar" },
+
+{ STR_PushStone, STR_LANG_ENG, "Push stone" },
+{ STR_Exit, STR_LANG_ENG, "Exit" },
+
+{ STR_GamePaused, STR_LANG_ENG, "GAME PAUSED" },
+
+{ STR_IgorObjectiveUikokahonia, STR_LANG_ENG, "\"Igor. Objective Uikokahonia\"" },
+{ STR_SharewareVersion, STR_LANG_ENG, "Shareware version" },
+{ STR_SharewarePlaceOrder, STR_LANG_ENG, "To place an order: 1-800-OPTIK-99" },
+
+{ STR_SharewareText1, STR_LANG_ENG, "This is SHAREWARE!" },
+{ STR_SharewareText2, STR_LANG_ENG, "You can copy this version!" },
+{ STR_SharewareText3, STR_LANG_ENG, "Pass it around, give it to your friends, family," },
+{ STR_SharewareText4, STR_LANG_ENG, "colleagues and upload it to your favorite BBS." },
+{ STR_SharewareText5, STR_LANG_ENG, "Let everyone enjoy IGOR!" },
+
+{ STR_SharewareOrder1, STR_LANG_ENG, "Order the full IGOR game for only $34.99 US." },
+{ STR_SharewareOrder2, STR_LANG_ENG, "$5.00 for shipping and handling (US & CANADA)." },
+{ STR_SharewareOrder3, STR_LANG_ENG, "Please add $3.00 for international shipping." },
+{ STR_SharewareOrder4, STR_LANG_ENG, "To place an order: 1-800-OPTIK-99" },
+
+{ STR_SharewareShipping1, STR_LANG_ENG, "90 day limited warranty." },
+{ STR_SharewareShipping2, STR_LANG_ENG, "Please allow 2-4 days for delivery (US only)." },
+{ STR_SharewareShipping3, STR_LANG_ENG, "Elsewhere, up to a week or two..." },
+{ STR_SharewareShipping4, STR_LANG_ENG, "Overnight/second day shipping available an" },
+{ STR_SharewareShipping5, STR_LANG_ENG, "aditional change. Please call for exact pricing." },
+{ STR_SharewareShipping6, STR_LANG_ENG, "Three easy ways to order:" },
+{ STR_SharewareShipping7, STR_LANG_ENG, "- Call 1-800-678-4599 (orders only) and use" },
+{ STR_SharewareShipping8, STR_LANG_ENG, "Your Visa, Mastercard or Discover card." },
+{ STR_SharewareShipping9, STR_LANG_ENG, "- Fax your order (please include credit card" },
+{ STR_SharewareShipping10, STR_LANG_ENG, "information) to (412) 381-1031" },
+
+{ STR_SharewareOptikAddress1, STR_LANG_ENG, "- Mail a check or money order to:" },
+{ STR_SharewareOptikAddress2, STR_LANG_ENG, "Optik Software Inc." },
+{ STR_SharewareOptikAddress3, STR_LANG_ENG, "1000 Napor Boulevard" },
+{ STR_SharewareOptikAddress4, STR_LANG_ENG, "Pittsburgh, PA. 15205" },
+{ STR_SharewareOptikAddress5, STR_LANG_ENG, "USA" },
+{ STR_SharewareOptikAddress6, STR_LANG_ENG, "Optik Software Inc." },
+{ STR_SharewareOptikAddress7, STR_LANG_ENG, "Orders only: 1-800-OPTIK-99 (67845-99)" },
+{ STR_SharewareOptikAddress8, STR_LANG_ENG, "Fax: (412) 381-1031" },
+{ STR_SharewareOptikAddress9, STR_LANG_ENG, "E-mail: optiksoft\xFA""aol.com" },
+
+{ STR_SharewarePenduloAddress1, STR_LANG_ENG, "A game by" },
+{ STR_SharewarePenduloAddress2, STR_LANG_ENG, "PENDULO STUDIOS" },
+{ STR_SharewarePenduloAddress3, STR_LANG_ENG, "P.O. Box 21091" },
+{ STR_SharewarePenduloAddress4, STR_LANG_ENG, "28009 Madrid" },
+{ STR_SharewarePenduloAddress5, STR_LANG_ENG, "Spain" },
+{ STR_SharewarePenduloAddress6, STR_LANG_ENG, "E-mail: 100641.1737\xFA""compuserve.com" },