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

1 files changed, 114 insertions, 53 deletions

diff --git a/engines/igor/resource_ids.h b/engines/igor/resource_ids.h
index 826e68dc6a..5920b2c521 100644
--- a/engines/igor/resource_ids.h
+++ b/engines/igor/resource_ids.h
@@ -332,56 +332,117 @@
 #define IMG_InventoryPanel 332
 #define IMG_Objects 333
 #define DAT_Physicsclassroom 334
-#define FRM_IgorDirBack2 335
-#define FRM_IgorDirRight2 336
-#define FRM_IgorDirFront2 337
-#define FRM_IgorDirLeft2 338
-#define FRM_IgorHead2 339
-#define STR_COPYRIGHT_1995 340
-#define STR_COPYRIGHT_1994 341
-#define STR_BOTTLE_OF_WHISKY 342
-#define STR_EMPTY_BOTTLE 343
-#define STR_BOTTLE_OF_WATER 344
-#define STR_LIZARD 345
-#define STR_FAT_LIZARD 346
-#define STR_CAROLINE_FOLDER 347
-#define STR_PHILIP_FOLDER 348
-#define STR_STATUETTE 349
-#define STR_REWARD 350
-#define STR_IGOR_OBJECTIVE_UIKOKAHONIA 351
-#define STR_SHAREWARE_VERSION 352
-#define STR_SHAREWARE_PLACE_ORDER 353
-#define STR_SHAREWARE_TEXT1 354
-#define STR_SHAREWARE_TEXT2 355
-#define STR_SHAREWARE_TEXT3 356
-#define STR_SHAREWARE_TEXT4 357
-#define STR_SHAREWARE_TEXT5 358
-#define STR_SHAREWARE_ORDER_1 359
-#define STR_SHAREWARE_ORDER_2 360
-#define STR_SHAREWARE_ORDER_3 361
-#define STR_SHAREWARE_ORDER_4 362
-#define STR_SHAREWARE_SHIPPING_1 363
-#define STR_SHAREWARE_SHIPPING_2 364
-#define STR_SHAREWARE_SHIPPING_3 365
-#define STR_SHAREWARE_SHIPPING_4 366
-#define STR_SHAREWARE_SHIPPING_5 367
-#define STR_SHAREWARE_SHIPPING_6 368
-#define STR_SHAREWARE_SHIPPING_7 369
-#define STR_SHAREWARE_SHIPPING_8 370
-#define STR_SHAREWARE_SHIPPING_9 371
-#define STR_SHAREWARE_SHIPPING_10 372
-#define STR_SHAREWARE_OPTIK_ADDRESS_1 373
-#define STR_SHAREWARE_OPTIK_ADDRESS_2 374
-#define STR_SHAREWARE_OPTIK_ADDRESS_3 375
-#define STR_SHAREWARE_OPTIK_ADDRESS_4 376
-#define STR_SHAREWARE_OPTIK_ADDRESS_5 377
-#define STR_SHAREWARE_OPTIK_ADDRESS_6 378
-#define STR_SHAREWARE_OPTIK_ADDRESS_7 379
-#define STR_SHAREWARE_OPTIK_ADDRESS_8 380
-#define STR_SHAREWARE_OPTIK_ADDRESS_9 381
-#define STR_SHAREWARE_PENDULO_ADDRESS_1 382
-#define STR_SHAREWARE_PENDULO_ADDRESS_2 383
-#define STR_SHAREWARE_PENDULO_ADDRESS_3 384
-#define STR_SHAREWARE_PENDULO_ADDRESS_4 385
-#define STR_SHAREWARE_PENDULO_ADDRESS_5 386
-#define STR_SHAREWARE_PENDULO_ADDRESS_6 387
+#define DAT_ParkRight 335
+#define DAT_ParkLeft 336
+#define FRM_Park1 337
+#define FRM_Park2 338
+#define FRM_Park3 339
+#define FRM_Park4 340
+#define TXT_Park 341
+#define IMG_Park 342
+#define PAL_Park 343
+#define MSK_Park 344
+#define BOX_Park 345
+#define DAT_OutsideAdministrationBuilding 346
+#define FRM_OutsideAdministrationBuilding1 347
+#define FRM_OutsideAdministrationBuilding2 348
+#define FRM_OutsideAdministrationBuilding3 349
+#define FRM_OutsideAdministrationBuilding4 350
+#define FRM_OutsideAdministrationBuilding5 351
+#define DAT_DeanPepperOffice 352
+#define DAT_AdministrationSecretaryRoom 353
+#define TXT_AdministrationSecretaryRoom 354
+#define IMG_AdministrationSecretaryRoom 355
+#define PAL_AdministrationSecretaryRoom 356
+#define MSK_AdministrationSecretaryRoom 357
+#define BOX_AdministrationSecretaryRoom 358
+#define FRM_DeanPepperOffice1 359
+#define FRM_DeanPepperOffice2 360
+#define FRM_DeanPepperOffice3 361
+#define FRM_DeanPepperOffice4 362
+#define FRM_DeanPepperOffice5 363
+#define FRM_DeanPepperOffice6 364
+#define FRM_DeanPepperOffice7 365
+#define FRM_DeanPepperOffice8 366
+#define FRM_DeanPepperOffice9 367
+#define FRM_DeanPepperOffice10 368
+#define FRM_DeanPepperOffice11 369
+#define FRM_DeanPepperOffice12 370
+#define FRM_DeanPepperOffice13 371
+#define FRM_DeanPepperOffice14 372
+#define FRM_DeanPepperOffice15 373
+#define FRM_DeanPepperOffice16 374
+#define TXT_DeanPepperOffice 375
+#define IMG_DeanPepperOffice 376
+#define PAL_DeanPepperOffice 377
+#define MSK_DeanPepperOffice 378
+#define BOX_DeanPepperOffice 379
+#define DAT_StudentDormitoryRoom 380
+#define TXT_StudentDormitoryRoom 381
+#define IMG_StudentDormitoryRoom 382
+#define PAL_StudentDormitoryRoom 383
+#define MSK_StudentDormitoryRoom 384
+#define BOX_StudentDormitoryRoom 385
+#define FRM_IgorDirBack2 386
+#define FRM_IgorDirRight2 387
+#define FRM_IgorDirFront2 388
+#define FRM_IgorDirLeft2 389
+#define FRM_IgorHead2 390
+#define STR_Copyright1995 391
+#define STR_Copyright1994 392
+#define STR_BottleOfWhisky 393
+#define STR_EmptyBottle 394
+#define STR_BottleOfWater 395
+#define STR_Lizard 396
+#define STR_FatLizard 397
+#define STR_CarolineFolder 398
+#define STR_PhilipFolder 399
+#define STR_Statuette 400
+#define STR_Reward 401
+#define STR_Talk 402
+#define STR_Take 403
+#define STR_Look 404
+#define STR_Use 405
+#define STR_Open 406
+#define STR_Close 407
+#define STR_Give 408
+#define STR_PushStone 409
+#define STR_Exit 410
+#define STR_GamePaused 411
+#define STR_IgorObjectiveUikokahonia 412
+#define STR_SharewareVersion 413
+#define STR_SharewarePlaceOrder 414
+#define STR_SharewareText1 415
+#define STR_SharewareText2 416
+#define STR_SharewareText3 417
+#define STR_SharewareText4 418
+#define STR_SharewareText5 419
+#define STR_SharewareOrder1 420
+#define STR_SharewareOrder2 421
+#define STR_SharewareOrder3 422
+#define STR_SharewareOrder4 423
+#define STR_SharewareShipping1 424
+#define STR_SharewareShipping2 425
+#define STR_SharewareShipping3 426
+#define STR_SharewareShipping4 427
+#define STR_SharewareShipping5 428
+#define STR_SharewareShipping6 429
+#define STR_SharewareShipping7 430
+#define STR_SharewareShipping8 431
+#define STR_SharewareShipping9 432
+#define STR_SharewareShipping10 433
+#define STR_SharewareOptikAddress1 434
+#define STR_SharewareOptikAddress2 435
+#define STR_SharewareOptikAddress3 436
+#define STR_SharewareOptikAddress4 437
+#define STR_SharewareOptikAddress5 438
+#define STR_SharewareOptikAddress6 439
+#define STR_SharewareOptikAddress7 440
+#define STR_SharewareOptikAddress8 441
+#define STR_SharewareOptikAddress9 442
+#define STR_SharewarePenduloAddress1 443
+#define STR_SharewarePenduloAddress2 444
+#define STR_SharewarePenduloAddress3 445
+#define STR_SharewarePenduloAddress4 446
+#define STR_SharewarePenduloAddress5 447
+#define STR_SharewarePenduloAddress6 448