rnd-20021230-1-src

diff --git a/src/conf_e2g.c b/src/conf_e2g.c
index 6972e8439cc4c6acf6971287bfd759fb0957a213..2cd375d611a431ab408cb7eff5dc0392fc01e20f 100644 (file)
--- a/src/conf_e2g.c
+++ b/src/conf_e2g.c
@@ -1412,6 +1412,10 @@ element_to_graphic[] =
     EL_EMERALD_YELLOW,                         -1, -1,
     IMG_EMERALD_YELLOW
   },
+  {
+    EL_EMERALD_YELLOW,                         -1, GFX_ACTION_MOVING,
+    IMG_EMERALD_YELLOW_MOVING
+  },
   {
     EL_EMERALD_YELLOW,                         -1, GFX_ACTION_FALLING,
     IMG_EMERALD_YELLOW_FALLING
@@ -1420,6 +1424,10 @@ element_to_graphic[] =
     EL_EMERALD_RED,                            -1, -1,
     IMG_EMERALD_RED
   },
+  {
+    EL_EMERALD_RED,                            -1, GFX_ACTION_MOVING,
+    IMG_EMERALD_RED_MOVING
+  },
   {
     EL_EMERALD_RED,                            -1, GFX_ACTION_FALLING,
     IMG_EMERALD_RED_FALLING
@@ -1428,6 +1436,10 @@ element_to_graphic[] =
     EL_EMERALD_PURPLE,                         -1, -1,
     IMG_EMERALD_PURPLE
   },
+  {
+    EL_EMERALD_PURPLE,                         -1, GFX_ACTION_MOVING,
+    IMG_EMERALD_PURPLE_MOVING
+  },
   {
     EL_EMERALD_PURPLE,                         -1, GFX_ACTION_FALLING,
     IMG_EMERALD_PURPLE_FALLING

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 886d95741038e300334022b27633f8d1ba1efa7c..f35c21cf388c8b0eddf1d897392125387bec73b0 100644 (file)
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -545,9 +545,9 @@ struct ConfigInfo image_config[] =
 
   /* images for Emerald Mine style elements and actions */
 
-  { "empty_space",                             "RocksElements.pcx"     },
-  { "empty_space.xpos",                                "7"                     },
-  { "empty_space.ypos",                                "9"                     },
+  { "empty_space",                             "RocksSP.pcx"           },
+  { "empty_space.xpos",                                "0"                     },
+  { "empty_space.ypos",                                "0"                     },
   { "empty_space.frames",                      "1"                     },
 
   { "sand",                                    "RocksElements.pcx"     },
@@ -1617,26 +1617,44 @@ struct ConfigInfo image_config[] =
   { "emerald_yellow.xpos",                     "10"                    },
   { "emerald_yellow.ypos",                     "8"                     },
   { "emerald_yellow.frames",                   "1"                     },
+  { "emerald_yellow.moving",                   "RocksElements.pcx"     },
+  { "emerald_yellow.moving.xpos",              "10"                    },
+  { "emerald_yellow.moving.ypos",              "8"                     },
+  { "emerald_yellow.moving.frames",            "2"                     },
+  { "emerald_yellow.moving.delay",             "4"                     },
   { "emerald_yellow.falling",                  "RocksElements.pcx"     },
   { "emerald_yellow.falling.xpos",             "10"                    },
   { "emerald_yellow.falling.ypos",             "8"                     },
   { "emerald_yellow.falling.frames",           "2"                     },
+  { "emerald_yellow.falling.delay",            "4"                     },
   { "emerald_red",                             "RocksElements.pcx"     },
   { "emerald_red.xpos",                                "8"                     },
   { "emerald_red.ypos",                                "9"                     },
   { "emerald_red.frames",                      "1"                     },
+  { "emerald_red.moving",                      "RocksElements.pcx"     },
+  { "emerald_red.moving.xpos",                 "8"                     },
+  { "emerald_red.moving.ypos",                 "9"                     },
+  { "emerald_red.moving.frames",               "2"                     },
+  { "emerald_red.moving.delay",                        "4"                     },
   { "emerald_red.falling",                     "RocksElements.pcx"     },
   { "emerald_red.falling.xpos",                        "8"                     },
   { "emerald_red.falling.ypos",                        "9"                     },
   { "emerald_red.falling.frames",              "2"                     },
+  { "emerald_red.falling.delay",               "4"                     },
   { "emerald_purple",                          "RocksElements.pcx"     },
   { "emerald_purple.xpos",                     "10"                    },
   { "emerald_purple.ypos",                     "9"                     },
   { "emerald_purple.frames",                   "1"                     },
+  { "emerald_purple.moving",                   "RocksElements.pcx"     },
+  { "emerald_purple.moving.xpos",              "10"                    },
+  { "emerald_purple.moving.ypos",              "9"                     },
+  { "emerald_purple.moving.frames",            "2"                     },
+  { "emerald_purple.moving.delay",             "4"                     },
   { "emerald_purple.falling",                  "RocksElements.pcx"     },
   { "emerald_purple.falling.xpos",             "10"                    },
   { "emerald_purple.falling.ypos",             "9"                     },
   { "emerald_purple.falling.frames",           "2"                     },
+  { "emerald_purple.falling.delay",            "4"                     },
 
   { "wall_emerald_yellow",                     "RocksElements.pcx"     },
   { "wall_emerald_yellow.xpos",                        "8"                     },

diff --git a/src/conf_gfx.h b/src/conf_gfx.h
index d1153bedc0266ea58e6efade440203b2568eeead..e065f7a6ff77e6dbcaceac01a190e4e51947733e 100644 (file)
--- a/src/conf_gfx.h
+++ b/src/conf_gfx.h
@@ -346,325 +346,328 @@
 #define IMG_TIME_ORB_FULL                      325
 #define IMG_TIME_ORB_EMPTY                     326
 #define IMG_EMERALD_YELLOW                     327
-#define IMG_EMERALD_YELLOW_FALLING             328
-#define IMG_EMERALD_RED                                329
-#define IMG_EMERALD_RED_FALLING                        330
-#define IMG_EMERALD_PURPLE                     331
-#define IMG_EMERALD_PURPLE_FALLING             332
-#define IMG_WALL_EMERALD_YELLOW                        333
-#define IMG_WALL_EMERALD_RED                   334
-#define IMG_WALL_EMERALD_PURPLE                        335
-#define IMG_WALL_BD_DIAMOND                    336
-#define IMG_WALL_GROWING                       337
-#define IMG_WALL_GROWING_XY                    338
-#define IMG_WALL_GROWING_X                     339
-#define IMG_WALL_GROWING_Y                     340
-#define IMG_WALL_GROWING_ACTIVE_LEFT           341
-#define IMG_WALL_GROWING_ACTIVE_RIGHT          342
-#define IMG_WALL_GROWING_ACTIVE_UP             343
-#define IMG_WALL_GROWING_ACTIVE_DOWN           344
-#define IMG_BLACK_ORB                          345
-#define IMG_SPEED_PILL                         346
-#define IMG_DARK_YAMYAM                                347
-#define IMG_DYNABOMB_ACTIVE                    348
-#define IMG_DYNABOMB_PLAYER1_ACTIVE            349
-#define IMG_DYNABOMB_PLAYER2_ACTIVE            350
-#define IMG_DYNABOMB_PLAYER3_ACTIVE            351
-#define IMG_DYNABOMB_PLAYER4_ACTIVE            352
-#define IMG_DYNABOMB_NR                                353
-#define IMG_DYNABOMB_SZ                                354
-#define IMG_DYNABOMB_XL                                355
-#define IMG_PIG                                        356
-#define IMG_PIG_DOWN                           357
-#define IMG_PIG_DOWN_MOVING                    358
-#define IMG_PIG_DOWN_EATING                    359
-#define IMG_PIG_UP                             360
-#define IMG_PIG_UP_MOVING                      361
-#define IMG_PIG_UP_EATING                      362
-#define IMG_PIG_LEFT                           363
-#define IMG_PIG_LEFT_MOVING                    364
-#define IMG_PIG_LEFT_EATING                    365
-#define IMG_PIG_RIGHT                          366
-#define IMG_PIG_RIGHT_MOVING                   367
-#define IMG_PIG_RIGHT_EATING                   368
-#define IMG_DRAGON                             369
-#define IMG_DRAGON_DOWN                                370
-#define IMG_DRAGON_DOWN_MOVING                 371
-#define IMG_DRAGON_DOWN_ATTACKING              372
-#define IMG_DRAGON_UP                          373
-#define IMG_DRAGON_UP_MOVING                   374
-#define IMG_DRAGON_UP_ATTACKING                        375
-#define IMG_DRAGON_LEFT                                376
-#define IMG_DRAGON_LEFT_MOVING                 377
-#define IMG_DRAGON_LEFT_ATTACKING              378
-#define IMG_DRAGON_RIGHT                       379
-#define IMG_DRAGON_RIGHT_MOVING                        380
-#define IMG_DRAGON_RIGHT_ATTACKING             381
-#define IMG_MOLE                               382
-#define IMG_MOLE_DOWN                          383
-#define IMG_MOLE_DOWN_MOVING                   384
-#define IMG_MOLE_DOWN_DIGGING                  385
-#define IMG_MOLE_UP                            386
-#define IMG_MOLE_UP_MOVING                     387
-#define IMG_MOLE_UP_DIGGING                    388
-#define IMG_MOLE_LEFT                          389
-#define IMG_MOLE_LEFT_MOVING                   390
-#define IMG_MOLE_LEFT_DIGGING                  391
-#define IMG_MOLE_RIGHT                         392
-#define IMG_MOLE_RIGHT_MOVING                  393
-#define IMG_MOLE_RIGHT_DIGGING                 394
-#define IMG_PENGUIN                            395
-#define IMG_PENGUIN_DOWN                       396
-#define IMG_PENGUIN_DOWN_MOVING                        397
-#define IMG_PENGUIN_UP                         398
-#define IMG_PENGUIN_UP_MOVING                  399
-#define IMG_PENGUIN_LEFT                       400
-#define IMG_PENGUIN_LEFT_MOVING                        401
-#define IMG_PENGUIN_RIGHT                      402
-#define IMG_PENGUIN_RIGHT_MOVING               403
-#define IMG_SATELLITE                          404
-#define IMG_SATELLITE_MOVING                   405
-#define IMG_FLAMES_LEFT1                       406
-#define IMG_FLAMES_LEFT2                       407
-#define IMG_FLAMES_LEFT3                       408
-#define IMG_FLAMES_RIGHT1                      409
-#define IMG_FLAMES_RIGHT2                      410
-#define IMG_FLAMES_RIGHT3                      411
-#define IMG_FLAMES_UP1                         412
-#define IMG_FLAMES_UP2                         413
-#define IMG_FLAMES_UP3                         414
-#define IMG_FLAMES_DOWN1                       415
-#define IMG_FLAMES_DOWN2                       416
-#define IMG_FLAMES_DOWN3                       417
-#define IMG_STONEBLOCK                         418
-#define IMG_PLAYER1                            419
-#define IMG_PLAYER1_DOWN                       420
-#define IMG_PLAYER1_DOWN_MOVING                        421
-#define IMG_PLAYER1_DOWN_DIGGING               422
-#define IMG_PLAYER1_DOWN_PUSHING               423
-#define IMG_PLAYER1_DOWN_SNAPPING              424
-#define IMG_PLAYER1_UP                         425
-#define IMG_PLAYER1_UP_MOVING                  426
-#define IMG_PLAYER1_UP_DIGGING                 427
-#define IMG_PLAYER1_UP_PUSHING                 428
-#define IMG_PLAYER1_UP_SNAPPING                        429
-#define IMG_PLAYER1_LEFT                       430
-#define IMG_PLAYER1_LEFT_MOVING                        431
-#define IMG_PLAYER1_LEFT_DIGGING               432
-#define IMG_PLAYER1_LEFT_PUSHING               433
-#define IMG_PLAYER1_LEFT_SNAPPING              434
-#define IMG_PLAYER1_RIGHT                      435
-#define IMG_PLAYER1_RIGHT_MOVING               436
-#define IMG_PLAYER1_RIGHT_DIGGING              437
-#define IMG_PLAYER1_RIGHT_PUSHING              438
-#define IMG_PLAYER1_RIGHT_SNAPPING             439
-#define IMG_PLAYER2                            440
-#define IMG_PLAYER2_DOWN                       441
-#define IMG_PLAYER2_DOWN_MOVING                        442
-#define IMG_PLAYER2_DOWN_DIGGING               443
-#define IMG_PLAYER2_DOWN_PUSHING               444
-#define IMG_PLAYER2_DOWN_SNAPPING              445
-#define IMG_PLAYER2_UP                         446
-#define IMG_PLAYER2_UP_MOVING                  447
-#define IMG_PLAYER2_UP_DIGGING                 448
-#define IMG_PLAYER2_UP_PUSHING                 449
-#define IMG_PLAYER2_UP_SNAPPING                        450
-#define IMG_PLAYER2_LEFT                       451
-#define IMG_PLAYER2_LEFT_MOVING                        452
-#define IMG_PLAYER2_LEFT_DIGGING               453
-#define IMG_PLAYER2_LEFT_PUSHING               454
-#define IMG_PLAYER2_LEFT_SNAPPING              455
-#define IMG_PLAYER2_RIGHT                      456
-#define IMG_PLAYER2_RIGHT_MOVING               457
-#define IMG_PLAYER2_RIGHT_DIGGING              458
-#define IMG_PLAYER2_RIGHT_PUSHING              459
-#define IMG_PLAYER2_RIGHT_SNAPPING             460
-#define IMG_PLAYER3                            461
-#define IMG_PLAYER3_DOWN                       462
-#define IMG_PLAYER3_DOWN_MOVING                        463
-#define IMG_PLAYER3_DOWN_DIGGING               464
-#define IMG_PLAYER3_DOWN_PUSHING               465
-#define IMG_PLAYER3_DOWN_SNAPPING              466
-#define IMG_PLAYER3_UP                         467
-#define IMG_PLAYER3_UP_MOVING                  468
-#define IMG_PLAYER3_UP_DIGGING                 469
-#define IMG_PLAYER3_UP_PUSHING                 470
-#define IMG_PLAYER3_UP_SNAPPING                        471
-#define IMG_PLAYER3_LEFT                       472
-#define IMG_PLAYER3_LEFT_MOVING                        473
-#define IMG_PLAYER3_LEFT_DIGGING               474
-#define IMG_PLAYER3_LEFT_PUSHING               475
-#define IMG_PLAYER3_LEFT_SNAPPING              476
-#define IMG_PLAYER3_RIGHT                      477
-#define IMG_PLAYER3_RIGHT_MOVING               478
-#define IMG_PLAYER3_RIGHT_DIGGING              479
-#define IMG_PLAYER3_RIGHT_PUSHING              480
-#define IMG_PLAYER3_RIGHT_SNAPPING             481
-#define IMG_PLAYER4                            482
-#define IMG_PLAYER4_DOWN                       483
-#define IMG_PLAYER4_DOWN_MOVING                        484
-#define IMG_PLAYER4_DOWN_DIGGING               485
-#define IMG_PLAYER4_DOWN_PUSHING               486
-#define IMG_PLAYER4_DOWN_SNAPPING              487
-#define IMG_PLAYER4_UP                         488
-#define IMG_PLAYER4_UP_MOVING                  489
-#define IMG_PLAYER4_UP_DIGGING                 490
-#define IMG_PLAYER4_UP_PUSHING                 491
-#define IMG_PLAYER4_UP_SNAPPING                        492
-#define IMG_PLAYER4_LEFT                       493
-#define IMG_PLAYER4_LEFT_MOVING                        494
-#define IMG_PLAYER4_LEFT_DIGGING               495
-#define IMG_PLAYER4_LEFT_PUSHING               496
-#define IMG_PLAYER4_LEFT_SNAPPING              497
-#define IMG_PLAYER4_RIGHT                      498
-#define IMG_PLAYER4_RIGHT_MOVING               499
-#define IMG_PLAYER4_RIGHT_DIGGING              500
-#define IMG_PLAYER4_RIGHT_PUSHING              501
-#define IMG_PLAYER4_RIGHT_SNAPPING             502
-#define IMG_EXPLOSION                          503
-#define IMG_TWINKLE_BLUE                       504
-#define IMG_TWINKLE_WHITE                      505
-#define IMG_STEELWALL_TOPLEFT                  506
-#define IMG_STEELWALL_TOPRIGHT                 507
-#define IMG_STEELWALL_BOTTOMLEFT               508
-#define IMG_STEELWALL_BOTTOMRIGHT              509
-#define IMG_STEELWALL_HORIZONTAL               510
-#define IMG_STEELWALL_VERTICAL                 511
-#define IMG_INVISIBLE_STEELWALL_TOPLEFT                512
-#define IMG_INVISIBLE_STEELWALL_TOPRIGHT       513
-#define IMG_INVISIBLE_STEELWALL_BOTTOMLEFT     514
-#define IMG_INVISIBLE_STEELWALL_BOTTOMRIGHT    515
-#define IMG_INVISIBLE_STEELWALL_HORIZONTAL     516
-#define IMG_INVISIBLE_STEELWALL_VERTICAL       517
-#define IMG_ARROW_BLUE_LEFT                    518
-#define IMG_ARROW_BLUE_RIGHT                   519
-#define IMG_ARROW_BLUE_UP                      520
-#define IMG_ARROW_BLUE_DOWN                    521
-#define IMG_ARROW_RED_LEFT                     522
-#define IMG_ARROW_RED_RIGHT                    523
-#define IMG_ARROW_RED_UP                       524
-#define IMG_ARROW_RED_DOWN                     525
-#define IMG_BALL_RED                           526
-#define IMG_BALL_BLUE                          527
-#define IMG_BALL_YELLOW                                528
-#define IMG_BALL_GRAY                          529
-#define IMG_SCROLLBAR_BLUE                     530
-#define IMG_SCROLLBAR_RED                      531
-#define IMG_SCROLLBAR_GREEN                    532
-#define IMG_SCROLLBAR_YELLOW                   533
-#define IMG_CHAR_SPACE                         534
-#define IMG_CHAR_EXCLAM                                535
-#define IMG_CHAR_QUOTEDBL                      536
-#define IMG_CHAR_NUMBERSIGN                    537
-#define IMG_CHAR_DOLLAR                                538
-#define IMG_CHAR_PROCENT                       539
-#define IMG_CHAR_AMPERSAND                     540
-#define IMG_CHAR_APOSTROPHE                    541
-#define IMG_CHAR_PARENLEFT                     542
-#define IMG_CHAR_PARENRIGHT                    543
-#define IMG_CHAR_ASTERISK                      544
-#define IMG_CHAR_PLUS                          545
-#define IMG_CHAR_COMMA                         546
-#define IMG_CHAR_MINUS                         547
-#define IMG_CHAR_PERIOD                                548
-#define IMG_CHAR_SLASH                         549
-#define IMG_CHAR_0                             550
-#define IMG_CHAR_1                             551
-#define IMG_CHAR_2                             552
-#define IMG_CHAR_3                             553
-#define IMG_CHAR_4                             554
-#define IMG_CHAR_5                             555
-#define IMG_CHAR_6                             556
-#define IMG_CHAR_7                             557
-#define IMG_CHAR_8                             558
-#define IMG_CHAR_9                             559
-#define IMG_CHAR_COLON                         560
-#define IMG_CHAR_SEMICOLON                     561
-#define IMG_CHAR_LESS                          562
-#define IMG_CHAR_EQUAL                         563
-#define IMG_CHAR_GREATER                       564
-#define IMG_CHAR_QUESTION                      565
-#define IMG_CHAR_AT                            566
-#define IMG_CHAR_A                             567
-#define IMG_CHAR_B                             568
-#define IMG_CHAR_C                             569
-#define IMG_CHAR_D                             570
-#define IMG_CHAR_E                             571
-#define IMG_CHAR_F                             572
-#define IMG_CHAR_G                             573
-#define IMG_CHAR_H                             574
-#define IMG_CHAR_I                             575
-#define IMG_CHAR_J                             576
-#define IMG_CHAR_K                             577
-#define IMG_CHAR_L                             578
-#define IMG_CHAR_M                             579
-#define IMG_CHAR_N                             580
-#define IMG_CHAR_O                             581
-#define IMG_CHAR_P                             582
-#define IMG_CHAR_Q                             583
-#define IMG_CHAR_R                             584
-#define IMG_CHAR_S                             585
-#define IMG_CHAR_T                             586
-#define IMG_CHAR_U                             587
-#define IMG_CHAR_V                             588
-#define IMG_CHAR_W                             589
-#define IMG_CHAR_X                             590
-#define IMG_CHAR_Y                             591
-#define IMG_CHAR_Z                             592
-#define IMG_CHAR_AE                            593
-#define IMG_CHAR_OE                            594
-#define IMG_CHAR_UE                            595
-#define IMG_CHAR_COPYRIGHT                     596
-#define IMG_CHAR_UNDERSCORE                    597
-#define IMG_CHAR_EMPTY                         598
-#define IMG_CHAR_DEGREE                                599
-#define IMG_CHAR_TM                            600
-#define IMG_CHAR_CURSOR                                601
-#define IMG_GENERIC_0                          602
-#define IMG_GENERIC_1                          603
-#define IMG_GENERIC_2                          604
-#define IMG_GENERIC_3                          605
-#define IMG_GENERIC_4                          606
-#define IMG_GENERIC_5                          607
-#define IMG_GENERIC_6                          608
-#define IMG_GENERIC_7                          609
-#define IMG_GENERIC_8                          610
-#define IMG_GENERIC_9                          611
-#define IMG_GENERIC_10                         612
-#define IMG_GENERIC_11                         613
-#define IMG_GENERIC_12                         614
-#define IMG_GENERIC_13                         615
-#define IMG_GENERIC_14                         616
-#define IMG_GENERIC_15                         617
-#define IMG_GENERIC_16                         618
-#define IMG_GENERIC_17                         619
-#define IMG_GENERIC_18                         620
-#define IMG_GENERIC_19                         621
-#define IMG_GENERIC_20                         622
-#define IMG_GENERIC_21                         623
-#define IMG_GENERIC_22                         624
-#define IMG_GENERIC_23                         625
-#define IMG_GENERIC_24                         626
-#define IMG_GENERIC_25                         627
-#define IMG_GENERIC_26                         628
-#define IMG_GENERIC_27                         629
-#define IMG_GENERIC_28                         630
-#define IMG_GENERIC_29                         631
-#define IMG_GENERIC_30                         632
-#define IMG_GENERIC_31                         633
-#define IMG_MENU_BACK                          634
-#define IMG_MENU_DOOR                          635
-#define IMG_MENU_TOONS                         636
-#define IMG_MENU_FONT_BIG                      637
-#define IMG_MENU_FONT_SMALL                    638
-#define IMG_MENU_FONT_MEDIUM                   639
-#define IMG_MENU_FONT_EM                       640
-#define IMG_INFO_FONT_EM_1                     641
-#define IMG_INFO_FONT_EM_2                     642
-#define IMG_INFO_FONT_EM_3                     643
-#define IMG_INFO_FONT_EM_4                     644
-#define IMG_INFO_FONT_EM_5                     645
+#define IMG_EMERALD_YELLOW_MOVING              328
+#define IMG_EMERALD_YELLOW_FALLING             329
+#define IMG_EMERALD_RED                                330
+#define IMG_EMERALD_RED_MOVING                 331
+#define IMG_EMERALD_RED_FALLING                        332
+#define IMG_EMERALD_PURPLE                     333
+#define IMG_EMERALD_PURPLE_MOVING              334
+#define IMG_EMERALD_PURPLE_FALLING             335
+#define IMG_WALL_EMERALD_YELLOW                        336
+#define IMG_WALL_EMERALD_RED                   337
+#define IMG_WALL_EMERALD_PURPLE                        338
+#define IMG_WALL_BD_DIAMOND                    339
+#define IMG_WALL_GROWING                       340
+#define IMG_WALL_GROWING_XY                    341
+#define IMG_WALL_GROWING_X                     342
+#define IMG_WALL_GROWING_Y                     343
+#define IMG_WALL_GROWING_ACTIVE_LEFT           344
+#define IMG_WALL_GROWING_ACTIVE_RIGHT          345
+#define IMG_WALL_GROWING_ACTIVE_UP             346
+#define IMG_WALL_GROWING_ACTIVE_DOWN           347
+#define IMG_BLACK_ORB                          348
+#define IMG_SPEED_PILL                         349
+#define IMG_DARK_YAMYAM                                350
+#define IMG_DYNABOMB_ACTIVE                    351
+#define IMG_DYNABOMB_PLAYER1_ACTIVE            352
+#define IMG_DYNABOMB_PLAYER2_ACTIVE            353
+#define IMG_DYNABOMB_PLAYER3_ACTIVE            354
+#define IMG_DYNABOMB_PLAYER4_ACTIVE            355
+#define IMG_DYNABOMB_NR                                356
+#define IMG_DYNABOMB_SZ                                357
+#define IMG_DYNABOMB_XL                                358
+#define IMG_PIG                                        359
+#define IMG_PIG_DOWN                           360
+#define IMG_PIG_DOWN_MOVING                    361
+#define IMG_PIG_DOWN_EATING                    362
+#define IMG_PIG_UP                             363
+#define IMG_PIG_UP_MOVING                      364
+#define IMG_PIG_UP_EATING                      365
+#define IMG_PIG_LEFT                           366
+#define IMG_PIG_LEFT_MOVING                    367
+#define IMG_PIG_LEFT_EATING                    368
+#define IMG_PIG_RIGHT                          369
+#define IMG_PIG_RIGHT_MOVING                   370
+#define IMG_PIG_RIGHT_EATING                   371
+#define IMG_DRAGON                             372
+#define IMG_DRAGON_DOWN                                373
+#define IMG_DRAGON_DOWN_MOVING                 374
+#define IMG_DRAGON_DOWN_ATTACKING              375
+#define IMG_DRAGON_UP                          376
+#define IMG_DRAGON_UP_MOVING                   377
+#define IMG_DRAGON_UP_ATTACKING                        378
+#define IMG_DRAGON_LEFT                                379
+#define IMG_DRAGON_LEFT_MOVING                 380
+#define IMG_DRAGON_LEFT_ATTACKING              381
+#define IMG_DRAGON_RIGHT                       382
+#define IMG_DRAGON_RIGHT_MOVING                        383
+#define IMG_DRAGON_RIGHT_ATTACKING             384
+#define IMG_MOLE                               385
+#define IMG_MOLE_DOWN                          386
+#define IMG_MOLE_DOWN_MOVING                   387
+#define IMG_MOLE_DOWN_DIGGING                  388
+#define IMG_MOLE_UP                            389
+#define IMG_MOLE_UP_MOVING                     390
+#define IMG_MOLE_UP_DIGGING                    391
+#define IMG_MOLE_LEFT                          392
+#define IMG_MOLE_LEFT_MOVING                   393
+#define IMG_MOLE_LEFT_DIGGING                  394
+#define IMG_MOLE_RIGHT                         395
+#define IMG_MOLE_RIGHT_MOVING                  396
+#define IMG_MOLE_RIGHT_DIGGING                 397
+#define IMG_PENGUIN                            398
+#define IMG_PENGUIN_DOWN                       399
+#define IMG_PENGUIN_DOWN_MOVING                        400
+#define IMG_PENGUIN_UP                         401
+#define IMG_PENGUIN_UP_MOVING                  402
+#define IMG_PENGUIN_LEFT                       403
+#define IMG_PENGUIN_LEFT_MOVING                        404
+#define IMG_PENGUIN_RIGHT                      405
+#define IMG_PENGUIN_RIGHT_MOVING               406
+#define IMG_SATELLITE                          407
+#define IMG_SATELLITE_MOVING                   408
+#define IMG_FLAMES_LEFT1                       409
+#define IMG_FLAMES_LEFT2                       410
+#define IMG_FLAMES_LEFT3                       411
+#define IMG_FLAMES_RIGHT1                      412
+#define IMG_FLAMES_RIGHT2                      413
+#define IMG_FLAMES_RIGHT3                      414
+#define IMG_FLAMES_UP1                         415
+#define IMG_FLAMES_UP2                         416
+#define IMG_FLAMES_UP3                         417
+#define IMG_FLAMES_DOWN1                       418
+#define IMG_FLAMES_DOWN2                       419
+#define IMG_FLAMES_DOWN3                       420
+#define IMG_STONEBLOCK                         421
+#define IMG_PLAYER1                            422
+#define IMG_PLAYER1_DOWN                       423
+#define IMG_PLAYER1_DOWN_MOVING                        424
+#define IMG_PLAYER1_DOWN_DIGGING               425
+#define IMG_PLAYER1_DOWN_PUSHING               426
+#define IMG_PLAYER1_DOWN_SNAPPING              427
+#define IMG_PLAYER1_UP                         428
+#define IMG_PLAYER1_UP_MOVING                  429
+#define IMG_PLAYER1_UP_DIGGING                 430
+#define IMG_PLAYER1_UP_PUSHING                 431
+#define IMG_PLAYER1_UP_SNAPPING                        432
+#define IMG_PLAYER1_LEFT                       433
+#define IMG_PLAYER1_LEFT_MOVING                        434
+#define IMG_PLAYER1_LEFT_DIGGING               435
+#define IMG_PLAYER1_LEFT_PUSHING               436
+#define IMG_PLAYER1_LEFT_SNAPPING              437
+#define IMG_PLAYER1_RIGHT                      438
+#define IMG_PLAYER1_RIGHT_MOVING               439
+#define IMG_PLAYER1_RIGHT_DIGGING              440
+#define IMG_PLAYER1_RIGHT_PUSHING              441
+#define IMG_PLAYER1_RIGHT_SNAPPING             442
+#define IMG_PLAYER2                            443
+#define IMG_PLAYER2_DOWN                       444
+#define IMG_PLAYER2_DOWN_MOVING                        445
+#define IMG_PLAYER2_DOWN_DIGGING               446
+#define IMG_PLAYER2_DOWN_PUSHING               447
+#define IMG_PLAYER2_DOWN_SNAPPING              448
+#define IMG_PLAYER2_UP                         449
+#define IMG_PLAYER2_UP_MOVING                  450
+#define IMG_PLAYER2_UP_DIGGING                 451
+#define IMG_PLAYER2_UP_PUSHING                 452
+#define IMG_PLAYER2_UP_SNAPPING                        453
+#define IMG_PLAYER2_LEFT                       454
+#define IMG_PLAYER2_LEFT_MOVING                        455
+#define IMG_PLAYER2_LEFT_DIGGING               456
+#define IMG_PLAYER2_LEFT_PUSHING               457
+#define IMG_PLAYER2_LEFT_SNAPPING              458
+#define IMG_PLAYER2_RIGHT                      459
+#define IMG_PLAYER2_RIGHT_MOVING               460
+#define IMG_PLAYER2_RIGHT_DIGGING              461
+#define IMG_PLAYER2_RIGHT_PUSHING              462
+#define IMG_PLAYER2_RIGHT_SNAPPING             463
+#define IMG_PLAYER3                            464
+#define IMG_PLAYER3_DOWN                       465
+#define IMG_PLAYER3_DOWN_MOVING                        466
+#define IMG_PLAYER3_DOWN_DIGGING               467
+#define IMG_PLAYER3_DOWN_PUSHING               468
+#define IMG_PLAYER3_DOWN_SNAPPING              469
+#define IMG_PLAYER3_UP                         470
+#define IMG_PLAYER3_UP_MOVING                  471
+#define IMG_PLAYER3_UP_DIGGING                 472
+#define IMG_PLAYER3_UP_PUSHING                 473
+#define IMG_PLAYER3_UP_SNAPPING                        474
+#define IMG_PLAYER3_LEFT                       475
+#define IMG_PLAYER3_LEFT_MOVING                        476
+#define IMG_PLAYER3_LEFT_DIGGING               477
+#define IMG_PLAYER3_LEFT_PUSHING               478
+#define IMG_PLAYER3_LEFT_SNAPPING              479
+#define IMG_PLAYER3_RIGHT                      480
+#define IMG_PLAYER3_RIGHT_MOVING               481
+#define IMG_PLAYER3_RIGHT_DIGGING              482
+#define IMG_PLAYER3_RIGHT_PUSHING              483
+#define IMG_PLAYER3_RIGHT_SNAPPING             484
+#define IMG_PLAYER4                            485
+#define IMG_PLAYER4_DOWN                       486
+#define IMG_PLAYER4_DOWN_MOVING                        487
+#define IMG_PLAYER4_DOWN_DIGGING               488
+#define IMG_PLAYER4_DOWN_PUSHING               489
+#define IMG_PLAYER4_DOWN_SNAPPING              490
+#define IMG_PLAYER4_UP                         491
+#define IMG_PLAYER4_UP_MOVING                  492
+#define IMG_PLAYER4_UP_DIGGING                 493
+#define IMG_PLAYER4_UP_PUSHING                 494
+#define IMG_PLAYER4_UP_SNAPPING                        495
+#define IMG_PLAYER4_LEFT                       496
+#define IMG_PLAYER4_LEFT_MOVING                        497
+#define IMG_PLAYER4_LEFT_DIGGING               498
+#define IMG_PLAYER4_LEFT_PUSHING               499
+#define IMG_PLAYER4_LEFT_SNAPPING              500
+#define IMG_PLAYER4_RIGHT                      501
+#define IMG_PLAYER4_RIGHT_MOVING               502
+#define IMG_PLAYER4_RIGHT_DIGGING              503
+#define IMG_PLAYER4_RIGHT_PUSHING              504
+#define IMG_PLAYER4_RIGHT_SNAPPING             505
+#define IMG_EXPLOSION                          506
+#define IMG_TWINKLE_BLUE                       507
+#define IMG_TWINKLE_WHITE                      508
+#define IMG_STEELWALL_TOPLEFT                  509
+#define IMG_STEELWALL_TOPRIGHT                 510
+#define IMG_STEELWALL_BOTTOMLEFT               511
+#define IMG_STEELWALL_BOTTOMRIGHT              512
+#define IMG_STEELWALL_HORIZONTAL               513
+#define IMG_STEELWALL_VERTICAL                 514
+#define IMG_INVISIBLE_STEELWALL_TOPLEFT                515
+#define IMG_INVISIBLE_STEELWALL_TOPRIGHT       516
+#define IMG_INVISIBLE_STEELWALL_BOTTOMLEFT     517
+#define IMG_INVISIBLE_STEELWALL_BOTTOMRIGHT    518
+#define IMG_INVISIBLE_STEELWALL_HORIZONTAL     519
+#define IMG_INVISIBLE_STEELWALL_VERTICAL       520
+#define IMG_ARROW_BLUE_LEFT                    521
+#define IMG_ARROW_BLUE_RIGHT                   522
+#define IMG_ARROW_BLUE_UP                      523
+#define IMG_ARROW_BLUE_DOWN                    524
+#define IMG_ARROW_RED_LEFT                     525
+#define IMG_ARROW_RED_RIGHT                    526
+#define IMG_ARROW_RED_UP                       527
+#define IMG_ARROW_RED_DOWN                     528
+#define IMG_BALL_RED                           529
+#define IMG_BALL_BLUE                          530
+#define IMG_BALL_YELLOW                                531
+#define IMG_BALL_GRAY                          532
+#define IMG_SCROLLBAR_BLUE                     533
+#define IMG_SCROLLBAR_RED                      534
+#define IMG_SCROLLBAR_GREEN                    535
+#define IMG_SCROLLBAR_YELLOW                   536
+#define IMG_CHAR_SPACE                         537
+#define IMG_CHAR_EXCLAM                                538
+#define IMG_CHAR_QUOTEDBL                      539
+#define IMG_CHAR_NUMBERSIGN                    540
+#define IMG_CHAR_DOLLAR                                541
+#define IMG_CHAR_PROCENT                       542
+#define IMG_CHAR_AMPERSAND                     543
+#define IMG_CHAR_APOSTROPHE                    544
+#define IMG_CHAR_PARENLEFT                     545
+#define IMG_CHAR_PARENRIGHT                    546
+#define IMG_CHAR_ASTERISK                      547
+#define IMG_CHAR_PLUS                          548
+#define IMG_CHAR_COMMA                         549
+#define IMG_CHAR_MINUS                         550
+#define IMG_CHAR_PERIOD                                551
+#define IMG_CHAR_SLASH                         552
+#define IMG_CHAR_0                             553
+#define IMG_CHAR_1                             554
+#define IMG_CHAR_2                             555
+#define IMG_CHAR_3                             556
+#define IMG_CHAR_4                             557
+#define IMG_CHAR_5                             558
+#define IMG_CHAR_6                             559
+#define IMG_CHAR_7                             560
+#define IMG_CHAR_8                             561
+#define IMG_CHAR_9                             562
+#define IMG_CHAR_COLON                         563
+#define IMG_CHAR_SEMICOLON                     564
+#define IMG_CHAR_LESS                          565
+#define IMG_CHAR_EQUAL                         566
+#define IMG_CHAR_GREATER                       567
+#define IMG_CHAR_QUESTION                      568
+#define IMG_CHAR_AT                            569
+#define IMG_CHAR_A                             570
+#define IMG_CHAR_B                             571
+#define IMG_CHAR_C                             572
+#define IMG_CHAR_D                             573
+#define IMG_CHAR_E                             574
+#define IMG_CHAR_F                             575
+#define IMG_CHAR_G                             576
+#define IMG_CHAR_H                             577
+#define IMG_CHAR_I                             578
+#define IMG_CHAR_J                             579
+#define IMG_CHAR_K                             580
+#define IMG_CHAR_L                             581
+#define IMG_CHAR_M                             582
+#define IMG_CHAR_N                             583
+#define IMG_CHAR_O                             584
+#define IMG_CHAR_P                             585
+#define IMG_CHAR_Q                             586
+#define IMG_CHAR_R                             587
+#define IMG_CHAR_S                             588
+#define IMG_CHAR_T                             589
+#define IMG_CHAR_U                             590
+#define IMG_CHAR_V                             591
+#define IMG_CHAR_W                             592
+#define IMG_CHAR_X                             593
+#define IMG_CHAR_Y                             594
+#define IMG_CHAR_Z                             595
+#define IMG_CHAR_AE                            596
+#define IMG_CHAR_OE                            597
+#define IMG_CHAR_UE                            598
+#define IMG_CHAR_COPYRIGHT                     599
+#define IMG_CHAR_UNDERSCORE                    600
+#define IMG_CHAR_EMPTY                         601
+#define IMG_CHAR_DEGREE                                602
+#define IMG_CHAR_TM                            603
+#define IMG_CHAR_CURSOR                                604
+#define IMG_GENERIC_0                          605
+#define IMG_GENERIC_1                          606
+#define IMG_GENERIC_2                          607
+#define IMG_GENERIC_3                          608
+#define IMG_GENERIC_4                          609
+#define IMG_GENERIC_5                          610
+#define IMG_GENERIC_6                          611
+#define IMG_GENERIC_7                          612
+#define IMG_GENERIC_8                          613
+#define IMG_GENERIC_9                          614
+#define IMG_GENERIC_10                         615
+#define IMG_GENERIC_11                         616
+#define IMG_GENERIC_12                         617
+#define IMG_GENERIC_13                         618
+#define IMG_GENERIC_14                         619
+#define IMG_GENERIC_15                         620
+#define IMG_GENERIC_16                         621
+#define IMG_GENERIC_17                         622
+#define IMG_GENERIC_18                         623
+#define IMG_GENERIC_19                         624
+#define IMG_GENERIC_20                         625
+#define IMG_GENERIC_21                         626
+#define IMG_GENERIC_22                         627
+#define IMG_GENERIC_23                         628
+#define IMG_GENERIC_24                         629
+#define IMG_GENERIC_25                         630
+#define IMG_GENERIC_26                         631
+#define IMG_GENERIC_27                         632
+#define IMG_GENERIC_28                         633
+#define IMG_GENERIC_29                         634
+#define IMG_GENERIC_30                         635
+#define IMG_GENERIC_31                         636
+#define IMG_MENU_BACK                          637
+#define IMG_MENU_DOOR                          638
+#define IMG_MENU_TOONS                         639
+#define IMG_MENU_FONT_BIG                      640
+#define IMG_MENU_FONT_SMALL                    641
+#define IMG_MENU_FONT_MEDIUM                   642
+#define IMG_MENU_FONT_EM                       643
+#define IMG_INFO_FONT_EM_1                     644
+#define IMG_INFO_FONT_EM_2                     645
+#define IMG_INFO_FONT_EM_3                     646
+#define IMG_INFO_FONT_EM_4                     647
+#define IMG_INFO_FONT_EM_5                     648
 
-#define NUM_IMAGE_FILES                                646
+#define NUM_IMAGE_FILES                                649
 
 #endif /* CONF_GFX_H */

diff --git a/src/conftime.h b/src/conftime.h
index e27460d7e96ccda709e5afbea76f23b00f4f1566..a6ab0657a0a78a1e33a0779b6b56b9dc61ea5baa 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2002-12-28 02:31]"
+#define COMPILE_DATE_STRING "[2002-12-30 03:03]"

diff --git a/src/init.c b/src/init.c
index 064de4a9efc3ed6f881cae4a50cff5c4fa82d96d..76bf20c3858a0f7c56a74411f64a90c1bf8e1d5e 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -876,14 +876,16 @@ static void InitGraphicInfo()
     if (src_x < 0 || src_y < 0 ||
        src_x + TILEX > src_bitmap->width ||
        src_y + TILEY > src_bitmap->height)
-      Error(ERR_EXIT, "InitGraphicInfo: first frame of graphic animation object %d outside of image bitmap file '%s'", i, src_bitmap->source_filename);
+      Error(ERR_EXIT, "InitGraphicInfo: first frame of graphic animation object %d outside of image bitmap file '%s' (%d,%d)",
+           i, src_bitmap->source_filename, src_x, src_y);
 
     last_frame = new_graphic_info[i].anim_frames - 1;
     getGraphicSource(i, last_frame, &src_bitmap, &src_x, &src_y);
     if (src_x < 0 || src_y < 0 ||
        src_x + TILEX > src_bitmap->width ||
        src_y + TILEY > src_bitmap->height)
-      Error(ERR_EXIT, "InitGraphicInfo: last frame of graphic animation object %d outside of image bitmap file '%s'", i, src_bitmap->source_filename);
+      Error(ERR_EXIT, "InitGraphicInfo: last frame of graphic animation object %d outside of image bitmap file '%s' (%d,%d)",
+           i, src_bitmap->source_filename, src_x, src_y);
   }
 }
 

diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index aeb115ef7ec9d5eda62550c1221e3a3cac274392..083b9c895f50b552859ac9407c6bf12755fab356 100644 (file)
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -2098,6 +2098,9 @@ static void SaveUserLevelInfo()
   ldi.first_level = 1;
   ldi.sort_priority = LEVELCLASS_USER_START;
   ldi.readonly = FALSE;
+  ldi.graphics_set = getStringCopy(GRAPHICS_SUBDIR);
+  ldi.sounds_set = getStringCopy(SOUNDS_SUBDIR);
+  ldi.music_set = getStringCopy(MUSIC_SUBDIR);
 
   fprintf(file, "%s\n\n", getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER,
                                                 getCookie("LEVELINFO")));

diff --git a/src/main.h b/src/main.h
index d54e5578a30d96fc1cdfb3f4ac4f6e398781a479..75eb0dc8f7860960edc5944ec03185bfe8cd6942 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -262,7 +262,7 @@
 #define VXSIZE                 DXSIZE
 #define VYSIZE                 100
 #define EXSIZE                 DXSIZE
-#define EYSIZE                 (VXSIZE + 44)
+#define EYSIZE                 (VYSIZE + 44)
 #define FULL_SXSIZE            (2 + SXSIZE + 2)
 #define FULL_SYSIZE            (2 + SYSIZE + 2)
 #define MICROLEV_XSIZE         ((STD_LEV_FIELDX + 2) * MICRO_TILEX)

diff --git a/src/tools.c b/src/tools.c
index 9b972e7df955a0557e9876d2c413142ab35859eb..ebb52194469b79b30d33fe7483dd29fa20ff5532 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -2395,7 +2395,11 @@ void DrawSpecialEditorDoor()
 {
   /* draw bigger toolbox window */
   BlitBitmap(new_graphic_info[IMG_MENU_DOOR].bitmap, drawto,
-            DOOR_GFX_PAGEX7, 0, 108, 56, EX - 4, EY - 12);
+            DOOR_GFX_PAGEX7, 0, EXSIZE + 8, 8,
+            EX - 4, EY - 12);
+  BlitBitmap(new_graphic_info[IMG_MENU_BACK].bitmap, drawto,
+            EX - 4, VY - 4, EXSIZE + 8, EYSIZE - VYSIZE + 4,
+            EX - 4, EY - 4);
 
   redraw_mask |= REDRAW_ALL;
 }
@@ -2404,7 +2408,8 @@ void UndrawSpecialEditorDoor()
 {
   /* draw normal tape recorder window */
   BlitBitmap(new_graphic_info[IMG_MENU_BACK].bitmap, drawto,
-            562, 344, 108, 56, EX - 4, EY - 12);
+            EX - 4, EY - 12, EXSIZE + 8, EYSIZE - VYSIZE + 12,
+            EX - 4, EY - 12);
 
   redraw_mask |= REDRAW_ALL;
 }