From c9735f4510c07f163fc103d61ba4e0d2010c2032 Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Sat, 4 Jan 2003 04:19:24 +0100 Subject: [PATCH] rnd-20030104-2-src --- src/conf_e2g.c | 12 + src/conf_gfx.c | 15 +- src/conf_gfx.h | 1248 ++++++++++++++++++++++--------------------- src/conftime.h | 2 +- src/editor.c | 6 + src/events.c | 2 + src/game.c | 2 +- src/init.c | 5 +- src/libgame/image.c | 2 +- src/libgame/misc.c | 15 +- src/libgame/text.c | 13 +- src/screens.c | 2 +- src/tools.c | 15 +- 13 files changed, 701 insertions(+), 638 deletions(-) diff --git a/src/conf_e2g.c b/src/conf_e2g.c index 2cd375d6..795d21ef 100644 --- a/src/conf_e2g.c +++ b/src/conf_e2g.c @@ -548,6 +548,18 @@ element_to_graphic[] = EL_NUT, -1, -1, IMG_NUT }, + { + EL_NUT, -1, GFX_ACTION_FALLING, + IMG_NUT_FALLING + }, + { + EL_NUT, MV_LEFT, GFX_ACTION_MOVING, + IMG_NUT_MOVING_LEFT + }, + { + EL_NUT, MV_RIGHT, GFX_ACTION_MOVING, + IMG_NUT_MOVING_RIGHT + }, { EL_NUT_CRACKING, -1, GFX_ACTION_CRACKING, IMG_NUT_CRACKING diff --git a/src/conf_gfx.c b/src/conf_gfx.c index c4107ce9..04d0634f 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -633,6 +633,18 @@ struct ConfigInfo image_config[] = { "nut.xpos", "12" }, { "nut.ypos", "1" }, { "nut.frames", "1" }, + { "nut.falling", "RocksElements.pcx" }, + { "nut.falling.xpos", "12" }, + { "nut.falling.ypos", "1" }, + { "nut.falling.frames", "1" }, + { "nut.moving_left", "RocksElements.pcx" }, + { "nut.moving_left.xpos", "12" }, + { "nut.moving_left.ypos", "1" }, + { "nut.moving_left.frames", "1" }, + { "nut.moving_right", "RocksElements.pcx" }, + { "nut.moving_right.xpos", "12" }, + { "nut.moving_right.ypos", "1" }, + { "nut.moving_right.frames", "1" }, { "nut.cracking", "RocksElements.pcx" }, { "nut.cracking.xpos", "13" }, { "nut.cracking.ypos", "1" }, @@ -2571,7 +2583,8 @@ struct ConfigInfo image_config[] = /* images not associated to game elements (used for menu screens etc.) */ /* keyword to stop parser: "NO_MORE_ELEMENT_IMAGES" <-- do not change! */ - { "menu.back", "RocksScreen.pcx" }, + { "menu.frame", "RocksScreen.pcx" }, + { "menu.back", UNDEFINED_FILENAME }, { "menu.door", "RocksDoor.pcx" }, { "menu.toons", "RocksToons.pcx" }, { "menu.font_big", "RocksFontBig.pcx" }, diff --git a/src/conf_gfx.h b/src/conf_gfx.h index 982b9982..de9f530c 100644 --- a/src/conf_gfx.h +++ b/src/conf_gfx.h @@ -142,628 +142,632 @@ #define IMG_DIAMOND_FALLING 121 #define IMG_BOMB 122 #define IMG_NUT 123 -#define IMG_NUT_CRACKING 124 -#define IMG_DYNAMITE 125 -#define IMG_DYNAMITE_ACTIVE 126 -#define IMG_WALL_EMERALD 127 -#define IMG_WALL_DIAMOND 128 -#define IMG_BUG_RIGHT 129 -#define IMG_BUG_UP 130 -#define IMG_BUG_LEFT 131 -#define IMG_BUG_DOWN 132 -#define IMG_SPACESHIP_RIGHT 133 -#define IMG_SPACESHIP_UP 134 -#define IMG_SPACESHIP_LEFT 135 -#define IMG_SPACESHIP_DOWN 136 -#define IMG_YAMYAM 137 -#define IMG_YAMYAM_MOVING 138 -#define IMG_ROBOT 139 -#define IMG_ROBOT_MOVING 140 -#define IMG_ROBOT_WHEEL 141 -#define IMG_ROBOT_WHEEL_ACTIVE 142 -#define IMG_MAGIC_WALL 143 -#define IMG_MAGIC_WALL_ACTIVE 144 -#define IMG_MAGIC_WALL_FILLING 145 -#define IMG_MAGIC_WALL_FULL 146 -#define IMG_MAGIC_WALL_EMPTYING 147 -#define IMG_MAGIC_WALL_DEAD 148 -#define IMG_QUICKSAND_EMPTY 149 -#define IMG_QUICKSAND_FILLING 150 -#define IMG_QUICKSAND_FULL 151 -#define IMG_QUICKSAND_EMPTYING 152 -#define IMG_ACIDPOOL_TOPLEFT 153 -#define IMG_ACIDPOOL_TOPRIGHT 154 -#define IMG_ACIDPOOL_BOTTOMLEFT 155 -#define IMG_ACIDPOOL_BOTTOM 156 -#define IMG_ACIDPOOL_BOTTOMRIGHT 157 -#define IMG_ACID 158 -#define IMG_ACID_SPLASH_LEFT 159 -#define IMG_ACID_SPLASH_RIGHT 160 -#define IMG_AMOEBA_DROP 161 -#define IMG_AMOEBA_CREATING 162 -#define IMG_AMOEBA_SHRINKING 163 -#define IMG_AMOEBA_WET 164 -#define IMG_AMOEBA_WET_PART1 165 -#define IMG_AMOEBA_WET_PART2 166 -#define IMG_AMOEBA_WET_PART3 167 -#define IMG_AMOEBA_WET_PART4 168 -#define IMG_AMOEBA_DRY 169 -#define IMG_AMOEBA_DRY_PART1 170 -#define IMG_AMOEBA_DRY_PART2 171 -#define IMG_AMOEBA_DRY_PART3 172 -#define IMG_AMOEBA_DRY_PART4 173 -#define IMG_AMOEBA_FULL 174 -#define IMG_AMOEBA_FULL_PART1 175 -#define IMG_AMOEBA_FULL_PART2 176 -#define IMG_AMOEBA_FULL_PART3 177 -#define IMG_AMOEBA_FULL_PART4 178 -#define IMG_AMOEBA_DEAD 179 -#define IMG_AMOEBA_DEAD_PART1 180 -#define IMG_AMOEBA_DEAD_PART2 181 -#define IMG_AMOEBA_DEAD_PART3 182 -#define IMG_AMOEBA_DEAD_PART4 183 -#define IMG_EM_KEY1 184 -#define IMG_EM_KEY2 185 -#define IMG_EM_KEY3 186 -#define IMG_EM_KEY4 187 -#define IMG_EM_GATE1 188 -#define IMG_EM_GATE2 189 -#define IMG_EM_GATE3 190 -#define IMG_EM_GATE4 191 -#define IMG_EM_GATE1_GRAY 192 -#define IMG_EM_GATE2_GRAY 193 -#define IMG_EM_GATE3_GRAY 194 -#define IMG_EM_GATE4_GRAY 195 -#define IMG_EXIT_CLOSED 196 -#define IMG_EXIT_OPENING 197 -#define IMG_EXIT_OPEN 198 -#define IMG_BALLOON 199 -#define IMG_BALLOON_MOVING 200 -#define IMG_BALLOON_SEND_LEFT 201 -#define IMG_BALLOON_SEND_RIGHT 202 -#define IMG_BALLOON_SEND_UP 203 -#define IMG_BALLOON_SEND_DOWN 204 -#define IMG_BALLOON_SEND_ANY_DIRECTION 205 -#define IMG_SPRING 206 -#define IMG_SPRING_MOVING 207 -#define IMG_EMC_STEELWALL1 208 -#define IMG_EMC_STEELWALL2 209 -#define IMG_EMC_STEELWALL3 210 -#define IMG_EMC_STEELWALL4 211 -#define IMG_EMC_WALL_PILLAR_UPPER 212 -#define IMG_EMC_WALL_PILLAR_MIDDLE 213 -#define IMG_EMC_WALL_PILLAR_LOWER 214 -#define IMG_EMC_WALL4 215 -#define IMG_EMC_WALL5 216 -#define IMG_EMC_WALL6 217 -#define IMG_EMC_WALL7 218 -#define IMG_EMC_WALL8 219 -#define IMG_INVISIBLE_STEELWALL 220 -#define IMG_INVISIBLE_STEELWALL_ACTIVE 221 -#define IMG_INVISIBLE_WALL 222 -#define IMG_INVISIBLE_WALL_ACTIVE 223 -#define IMG_INVISIBLE_SAND 224 -#define IMG_INVISIBLE_SAND_ACTIVE 225 -#define IMG_CONVEYOR_BELT1_MIDDLE 226 -#define IMG_CONVEYOR_BELT1_MIDDLE_ACTIVE 227 -#define IMG_CONVEYOR_BELT1_LEFT 228 -#define IMG_CONVEYOR_BELT1_LEFT_ACTIVE 229 -#define IMG_CONVEYOR_BELT1_RIGHT 230 -#define IMG_CONVEYOR_BELT1_RIGHT_ACTIVE 231 -#define IMG_CONVEYOR_BELT1_SWITCH_LEFT 232 -#define IMG_CONVEYOR_BELT1_SWITCH_MIDDLE 233 -#define IMG_CONVEYOR_BELT1_SWITCH_RIGHT 234 -#define IMG_CONVEYOR_BELT2_MIDDLE 235 -#define IMG_CONVEYOR_BELT2_MIDDLE_ACTIVE 236 -#define IMG_CONVEYOR_BELT2_LEFT 237 -#define IMG_CONVEYOR_BELT2_LEFT_ACTIVE 238 -#define IMG_CONVEYOR_BELT2_RIGHT 239 -#define IMG_CONVEYOR_BELT2_RIGHT_ACTIVE 240 -#define IMG_CONVEYOR_BELT2_SWITCH_LEFT 241 -#define IMG_CONVEYOR_BELT2_SWITCH_MIDDLE 242 -#define IMG_CONVEYOR_BELT2_SWITCH_RIGHT 243 -#define IMG_CONVEYOR_BELT3_MIDDLE 244 -#define IMG_CONVEYOR_BELT3_MIDDLE_ACTIVE 245 -#define IMG_CONVEYOR_BELT3_LEFT 246 -#define IMG_CONVEYOR_BELT3_LEFT_ACTIVE 247 -#define IMG_CONVEYOR_BELT3_RIGHT 248 -#define IMG_CONVEYOR_BELT3_RIGHT_ACTIVE 249 -#define IMG_CONVEYOR_BELT3_SWITCH_LEFT 250 -#define IMG_CONVEYOR_BELT3_SWITCH_MIDDLE 251 -#define IMG_CONVEYOR_BELT3_SWITCH_RIGHT 252 -#define IMG_CONVEYOR_BELT4_MIDDLE 253 -#define IMG_CONVEYOR_BELT4_MIDDLE_ACTIVE 254 -#define IMG_CONVEYOR_BELT4_LEFT 255 -#define IMG_CONVEYOR_BELT4_LEFT_ACTIVE 256 -#define IMG_CONVEYOR_BELT4_RIGHT 257 -#define IMG_CONVEYOR_BELT4_RIGHT_ACTIVE 258 -#define IMG_CONVEYOR_BELT4_SWITCH_LEFT 259 -#define IMG_CONVEYOR_BELT4_SWITCH_MIDDLE 260 -#define IMG_CONVEYOR_BELT4_SWITCH_RIGHT 261 -#define IMG_SWITCHGATE_SWITCH_UP 262 -#define IMG_SWITCHGATE_SWITCH_DOWN 263 -#define IMG_LIGHT_SWITCH 264 -#define IMG_LIGHT_SWITCH_ACTIVE 265 -#define IMG_TIMEGATE_SWITCH 266 -#define IMG_TIMEGATE_SWITCH_ACTIVE 267 -#define IMG_ENVELOPE 268 -#define IMG_SIGN_EXCLAMATION 269 -#define IMG_SIGN_STOP 270 -#define IMG_LANDMINE 271 -#define IMG_STEELWALL_SLANTED 272 -#define IMG_EXTRA_TIME 273 -#define IMG_SHIELD_NORMAL 274 -#define IMG_SHIELD_DEADLY 275 -#define IMG_SHIELD_NORMAL_ACTIVE 276 -#define IMG_SHIELD_DEADLY_ACTIVE 277 -#define IMG_SWITCHGATE_CLOSED 278 -#define IMG_SWITCHGATE_OPENING 279 -#define IMG_SWITCHGATE_OPEN 280 -#define IMG_SWITCHGATE_CLOSING 281 -#define IMG_TIMEGATE_CLOSED 282 -#define IMG_TIMEGATE_OPENING 283 -#define IMG_TIMEGATE_OPEN 284 -#define IMG_TIMEGATE_CLOSING 285 -#define IMG_PEARL 286 -#define IMG_PEARL_BREAKING 287 -#define IMG_CRYSTAL 288 -#define IMG_WALL_PEARL 289 -#define IMG_WALL_CRYSTAL 290 -#define IMG_TUBE_RIGHT_DOWN 291 -#define IMG_TUBE_HORIZONTAL_DOWN 292 -#define IMG_TUBE_LEFT_DOWN 293 -#define IMG_TUBE_HORIZONTAL 294 -#define IMG_TUBE_VERTICAL_RIGHT 295 -#define IMG_TUBE_ALL 296 -#define IMG_TUBE_VERTICAL_LEFT 297 -#define IMG_TUBE_VERTICAL 298 -#define IMG_TUBE_RIGHT_UP 299 -#define IMG_TUBE_HORIZONTAL_UP 300 -#define IMG_TUBE_LEFT_UP 301 -#define IMG_TRAP 302 -#define IMG_TRAP_ACTIVE 303 -#define IMG_DX_SUPABOMB 304 -#define IMG_KEY1 305 -#define IMG_KEY2 306 -#define IMG_KEY3 307 -#define IMG_KEY4 308 -#define IMG_GATE1 309 -#define IMG_GATE2 310 -#define IMG_GATE3 311 -#define IMG_GATE4 312 -#define IMG_GATE1_GRAY 313 -#define IMG_GATE2_GRAY 314 -#define IMG_GATE3_GRAY 315 -#define IMG_GATE4_GRAY 316 -#define IMG_GAMEOFLIFE 317 -#define IMG_BIOMAZE 318 -#define IMG_PACMAN_RIGHT 319 -#define IMG_PACMAN_UP 320 -#define IMG_PACMAN_LEFT 321 -#define IMG_PACMAN_DOWN 322 -#define IMG_LAMP 323 -#define IMG_LAMP_ACTIVE 324 -#define IMG_TIME_ORB_FULL 325 -#define IMG_TIME_ORB_EMPTY 326 -#define IMG_EMERALD_YELLOW 327 -#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_CUSTOM_0 605 -#define IMG_CUSTOM_1 606 -#define IMG_CUSTOM_2 607 -#define IMG_CUSTOM_3 608 -#define IMG_CUSTOM_4 609 -#define IMG_CUSTOM_5 610 -#define IMG_CUSTOM_6 611 -#define IMG_CUSTOM_7 612 -#define IMG_CUSTOM_8 613 -#define IMG_CUSTOM_9 614 -#define IMG_CUSTOM_10 615 -#define IMG_CUSTOM_11 616 -#define IMG_CUSTOM_12 617 -#define IMG_CUSTOM_13 618 -#define IMG_CUSTOM_14 619 -#define IMG_CUSTOM_15 620 -#define IMG_CUSTOM_16 621 -#define IMG_CUSTOM_17 622 -#define IMG_CUSTOM_18 623 -#define IMG_CUSTOM_19 624 -#define IMG_CUSTOM_20 625 -#define IMG_CUSTOM_21 626 -#define IMG_CUSTOM_22 627 -#define IMG_CUSTOM_23 628 -#define IMG_CUSTOM_24 629 -#define IMG_CUSTOM_25 630 -#define IMG_CUSTOM_26 631 -#define IMG_CUSTOM_27 632 -#define IMG_CUSTOM_28 633 -#define IMG_CUSTOM_29 634 -#define IMG_CUSTOM_30 635 -#define IMG_CUSTOM_31 636 -#define IMG_CUSTOM_32 637 -#define IMG_CUSTOM_33 638 -#define IMG_CUSTOM_34 639 -#define IMG_CUSTOM_35 640 -#define IMG_CUSTOM_36 641 -#define IMG_CUSTOM_37 642 -#define IMG_CUSTOM_38 643 -#define IMG_CUSTOM_39 644 -#define IMG_CUSTOM_40 645 -#define IMG_CUSTOM_41 646 -#define IMG_CUSTOM_42 647 -#define IMG_CUSTOM_43 648 -#define IMG_CUSTOM_44 649 -#define IMG_CUSTOM_45 650 -#define IMG_CUSTOM_46 651 -#define IMG_CUSTOM_47 652 -#define IMG_CUSTOM_48 653 -#define IMG_CUSTOM_49 654 -#define IMG_CUSTOM_50 655 -#define IMG_CUSTOM_51 656 -#define IMG_CUSTOM_52 657 -#define IMG_CUSTOM_53 658 -#define IMG_CUSTOM_54 659 -#define IMG_CUSTOM_55 660 -#define IMG_CUSTOM_56 661 -#define IMG_CUSTOM_57 662 -#define IMG_CUSTOM_58 663 -#define IMG_CUSTOM_59 664 -#define IMG_CUSTOM_60 665 -#define IMG_CUSTOM_61 666 -#define IMG_CUSTOM_62 667 -#define IMG_CUSTOM_63 668 -#define IMG_CUSTOM_64 669 -#define IMG_CUSTOM_65 670 -#define IMG_CUSTOM_66 671 -#define IMG_CUSTOM_67 672 -#define IMG_CUSTOM_68 673 -#define IMG_CUSTOM_69 674 -#define IMG_CUSTOM_70 675 -#define IMG_CUSTOM_71 676 -#define IMG_CUSTOM_72 677 -#define IMG_CUSTOM_73 678 -#define IMG_CUSTOM_74 679 -#define IMG_CUSTOM_75 680 -#define IMG_CUSTOM_76 681 -#define IMG_CUSTOM_77 682 -#define IMG_CUSTOM_78 683 -#define IMG_CUSTOM_79 684 -#define IMG_CUSTOM_80 685 -#define IMG_CUSTOM_81 686 -#define IMG_CUSTOM_82 687 -#define IMG_CUSTOM_83 688 -#define IMG_CUSTOM_84 689 -#define IMG_CUSTOM_85 690 -#define IMG_CUSTOM_86 691 -#define IMG_CUSTOM_87 692 -#define IMG_CUSTOM_88 693 -#define IMG_CUSTOM_89 694 -#define IMG_CUSTOM_90 695 -#define IMG_CUSTOM_91 696 -#define IMG_CUSTOM_92 697 -#define IMG_CUSTOM_93 698 -#define IMG_CUSTOM_94 699 -#define IMG_CUSTOM_95 700 -#define IMG_CUSTOM_96 701 -#define IMG_CUSTOM_97 702 -#define IMG_CUSTOM_98 703 -#define IMG_CUSTOM_99 704 -#define IMG_CUSTOM_100 705 -#define IMG_CUSTOM_101 706 -#define IMG_CUSTOM_102 707 -#define IMG_CUSTOM_103 708 -#define IMG_CUSTOM_104 709 -#define IMG_CUSTOM_105 710 -#define IMG_CUSTOM_106 711 -#define IMG_CUSTOM_107 712 -#define IMG_CUSTOM_108 713 -#define IMG_CUSTOM_109 714 -#define IMG_CUSTOM_110 715 -#define IMG_CUSTOM_111 716 -#define IMG_CUSTOM_112 717 -#define IMG_CUSTOM_113 718 -#define IMG_CUSTOM_114 719 -#define IMG_CUSTOM_115 720 -#define IMG_CUSTOM_116 721 -#define IMG_CUSTOM_117 722 -#define IMG_CUSTOM_118 723 -#define IMG_CUSTOM_119 724 -#define IMG_CUSTOM_120 725 -#define IMG_CUSTOM_121 726 -#define IMG_CUSTOM_122 727 -#define IMG_CUSTOM_123 728 -#define IMG_CUSTOM_124 729 -#define IMG_CUSTOM_125 730 -#define IMG_CUSTOM_126 731 -#define IMG_CUSTOM_127 732 -#define IMG_MENU_BACK 733 -#define IMG_MENU_DOOR 734 -#define IMG_MENU_TOONS 735 -#define IMG_MENU_FONT_BIG 736 -#define IMG_MENU_FONT_SMALL 737 -#define IMG_MENU_FONT_MEDIUM 738 -#define IMG_MENU_FONT_EM 739 -#define IMG_INFO_FONT_EM_1 740 -#define IMG_INFO_FONT_EM_2 741 -#define IMG_INFO_FONT_EM_3 742 -#define IMG_INFO_FONT_EM_4 743 -#define IMG_INFO_FONT_EM_5 744 +#define IMG_NUT_FALLING 124 +#define IMG_NUT_MOVING_LEFT 125 +#define IMG_NUT_MOVING_RIGHT 126 +#define IMG_NUT_CRACKING 127 +#define IMG_DYNAMITE 128 +#define IMG_DYNAMITE_ACTIVE 129 +#define IMG_WALL_EMERALD 130 +#define IMG_WALL_DIAMOND 131 +#define IMG_BUG_RIGHT 132 +#define IMG_BUG_UP 133 +#define IMG_BUG_LEFT 134 +#define IMG_BUG_DOWN 135 +#define IMG_SPACESHIP_RIGHT 136 +#define IMG_SPACESHIP_UP 137 +#define IMG_SPACESHIP_LEFT 138 +#define IMG_SPACESHIP_DOWN 139 +#define IMG_YAMYAM 140 +#define IMG_YAMYAM_MOVING 141 +#define IMG_ROBOT 142 +#define IMG_ROBOT_MOVING 143 +#define IMG_ROBOT_WHEEL 144 +#define IMG_ROBOT_WHEEL_ACTIVE 145 +#define IMG_MAGIC_WALL 146 +#define IMG_MAGIC_WALL_ACTIVE 147 +#define IMG_MAGIC_WALL_FILLING 148 +#define IMG_MAGIC_WALL_FULL 149 +#define IMG_MAGIC_WALL_EMPTYING 150 +#define IMG_MAGIC_WALL_DEAD 151 +#define IMG_QUICKSAND_EMPTY 152 +#define IMG_QUICKSAND_FILLING 153 +#define IMG_QUICKSAND_FULL 154 +#define IMG_QUICKSAND_EMPTYING 155 +#define IMG_ACIDPOOL_TOPLEFT 156 +#define IMG_ACIDPOOL_TOPRIGHT 157 +#define IMG_ACIDPOOL_BOTTOMLEFT 158 +#define IMG_ACIDPOOL_BOTTOM 159 +#define IMG_ACIDPOOL_BOTTOMRIGHT 160 +#define IMG_ACID 161 +#define IMG_ACID_SPLASH_LEFT 162 +#define IMG_ACID_SPLASH_RIGHT 163 +#define IMG_AMOEBA_DROP 164 +#define IMG_AMOEBA_CREATING 165 +#define IMG_AMOEBA_SHRINKING 166 +#define IMG_AMOEBA_WET 167 +#define IMG_AMOEBA_WET_PART1 168 +#define IMG_AMOEBA_WET_PART2 169 +#define IMG_AMOEBA_WET_PART3 170 +#define IMG_AMOEBA_WET_PART4 171 +#define IMG_AMOEBA_DRY 172 +#define IMG_AMOEBA_DRY_PART1 173 +#define IMG_AMOEBA_DRY_PART2 174 +#define IMG_AMOEBA_DRY_PART3 175 +#define IMG_AMOEBA_DRY_PART4 176 +#define IMG_AMOEBA_FULL 177 +#define IMG_AMOEBA_FULL_PART1 178 +#define IMG_AMOEBA_FULL_PART2 179 +#define IMG_AMOEBA_FULL_PART3 180 +#define IMG_AMOEBA_FULL_PART4 181 +#define IMG_AMOEBA_DEAD 182 +#define IMG_AMOEBA_DEAD_PART1 183 +#define IMG_AMOEBA_DEAD_PART2 184 +#define IMG_AMOEBA_DEAD_PART3 185 +#define IMG_AMOEBA_DEAD_PART4 186 +#define IMG_EM_KEY1 187 +#define IMG_EM_KEY2 188 +#define IMG_EM_KEY3 189 +#define IMG_EM_KEY4 190 +#define IMG_EM_GATE1 191 +#define IMG_EM_GATE2 192 +#define IMG_EM_GATE3 193 +#define IMG_EM_GATE4 194 +#define IMG_EM_GATE1_GRAY 195 +#define IMG_EM_GATE2_GRAY 196 +#define IMG_EM_GATE3_GRAY 197 +#define IMG_EM_GATE4_GRAY 198 +#define IMG_EXIT_CLOSED 199 +#define IMG_EXIT_OPENING 200 +#define IMG_EXIT_OPEN 201 +#define IMG_BALLOON 202 +#define IMG_BALLOON_MOVING 203 +#define IMG_BALLOON_SEND_LEFT 204 +#define IMG_BALLOON_SEND_RIGHT 205 +#define IMG_BALLOON_SEND_UP 206 +#define IMG_BALLOON_SEND_DOWN 207 +#define IMG_BALLOON_SEND_ANY_DIRECTION 208 +#define IMG_SPRING 209 +#define IMG_SPRING_MOVING 210 +#define IMG_EMC_STEELWALL1 211 +#define IMG_EMC_STEELWALL2 212 +#define IMG_EMC_STEELWALL3 213 +#define IMG_EMC_STEELWALL4 214 +#define IMG_EMC_WALL_PILLAR_UPPER 215 +#define IMG_EMC_WALL_PILLAR_MIDDLE 216 +#define IMG_EMC_WALL_PILLAR_LOWER 217 +#define IMG_EMC_WALL4 218 +#define IMG_EMC_WALL5 219 +#define IMG_EMC_WALL6 220 +#define IMG_EMC_WALL7 221 +#define IMG_EMC_WALL8 222 +#define IMG_INVISIBLE_STEELWALL 223 +#define IMG_INVISIBLE_STEELWALL_ACTIVE 224 +#define IMG_INVISIBLE_WALL 225 +#define IMG_INVISIBLE_WALL_ACTIVE 226 +#define IMG_INVISIBLE_SAND 227 +#define IMG_INVISIBLE_SAND_ACTIVE 228 +#define IMG_CONVEYOR_BELT1_MIDDLE 229 +#define IMG_CONVEYOR_BELT1_MIDDLE_ACTIVE 230 +#define IMG_CONVEYOR_BELT1_LEFT 231 +#define IMG_CONVEYOR_BELT1_LEFT_ACTIVE 232 +#define IMG_CONVEYOR_BELT1_RIGHT 233 +#define IMG_CONVEYOR_BELT1_RIGHT_ACTIVE 234 +#define IMG_CONVEYOR_BELT1_SWITCH_LEFT 235 +#define IMG_CONVEYOR_BELT1_SWITCH_MIDDLE 236 +#define IMG_CONVEYOR_BELT1_SWITCH_RIGHT 237 +#define IMG_CONVEYOR_BELT2_MIDDLE 238 +#define IMG_CONVEYOR_BELT2_MIDDLE_ACTIVE 239 +#define IMG_CONVEYOR_BELT2_LEFT 240 +#define IMG_CONVEYOR_BELT2_LEFT_ACTIVE 241 +#define IMG_CONVEYOR_BELT2_RIGHT 242 +#define IMG_CONVEYOR_BELT2_RIGHT_ACTIVE 243 +#define IMG_CONVEYOR_BELT2_SWITCH_LEFT 244 +#define IMG_CONVEYOR_BELT2_SWITCH_MIDDLE 245 +#define IMG_CONVEYOR_BELT2_SWITCH_RIGHT 246 +#define IMG_CONVEYOR_BELT3_MIDDLE 247 +#define IMG_CONVEYOR_BELT3_MIDDLE_ACTIVE 248 +#define IMG_CONVEYOR_BELT3_LEFT 249 +#define IMG_CONVEYOR_BELT3_LEFT_ACTIVE 250 +#define IMG_CONVEYOR_BELT3_RIGHT 251 +#define IMG_CONVEYOR_BELT3_RIGHT_ACTIVE 252 +#define IMG_CONVEYOR_BELT3_SWITCH_LEFT 253 +#define IMG_CONVEYOR_BELT3_SWITCH_MIDDLE 254 +#define IMG_CONVEYOR_BELT3_SWITCH_RIGHT 255 +#define IMG_CONVEYOR_BELT4_MIDDLE 256 +#define IMG_CONVEYOR_BELT4_MIDDLE_ACTIVE 257 +#define IMG_CONVEYOR_BELT4_LEFT 258 +#define IMG_CONVEYOR_BELT4_LEFT_ACTIVE 259 +#define IMG_CONVEYOR_BELT4_RIGHT 260 +#define IMG_CONVEYOR_BELT4_RIGHT_ACTIVE 261 +#define IMG_CONVEYOR_BELT4_SWITCH_LEFT 262 +#define IMG_CONVEYOR_BELT4_SWITCH_MIDDLE 263 +#define IMG_CONVEYOR_BELT4_SWITCH_RIGHT 264 +#define IMG_SWITCHGATE_SWITCH_UP 265 +#define IMG_SWITCHGATE_SWITCH_DOWN 266 +#define IMG_LIGHT_SWITCH 267 +#define IMG_LIGHT_SWITCH_ACTIVE 268 +#define IMG_TIMEGATE_SWITCH 269 +#define IMG_TIMEGATE_SWITCH_ACTIVE 270 +#define IMG_ENVELOPE 271 +#define IMG_SIGN_EXCLAMATION 272 +#define IMG_SIGN_STOP 273 +#define IMG_LANDMINE 274 +#define IMG_STEELWALL_SLANTED 275 +#define IMG_EXTRA_TIME 276 +#define IMG_SHIELD_NORMAL 277 +#define IMG_SHIELD_DEADLY 278 +#define IMG_SHIELD_NORMAL_ACTIVE 279 +#define IMG_SHIELD_DEADLY_ACTIVE 280 +#define IMG_SWITCHGATE_CLOSED 281 +#define IMG_SWITCHGATE_OPENING 282 +#define IMG_SWITCHGATE_OPEN 283 +#define IMG_SWITCHGATE_CLOSING 284 +#define IMG_TIMEGATE_CLOSED 285 +#define IMG_TIMEGATE_OPENING 286 +#define IMG_TIMEGATE_OPEN 287 +#define IMG_TIMEGATE_CLOSING 288 +#define IMG_PEARL 289 +#define IMG_PEARL_BREAKING 290 +#define IMG_CRYSTAL 291 +#define IMG_WALL_PEARL 292 +#define IMG_WALL_CRYSTAL 293 +#define IMG_TUBE_RIGHT_DOWN 294 +#define IMG_TUBE_HORIZONTAL_DOWN 295 +#define IMG_TUBE_LEFT_DOWN 296 +#define IMG_TUBE_HORIZONTAL 297 +#define IMG_TUBE_VERTICAL_RIGHT 298 +#define IMG_TUBE_ALL 299 +#define IMG_TUBE_VERTICAL_LEFT 300 +#define IMG_TUBE_VERTICAL 301 +#define IMG_TUBE_RIGHT_UP 302 +#define IMG_TUBE_HORIZONTAL_UP 303 +#define IMG_TUBE_LEFT_UP 304 +#define IMG_TRAP 305 +#define IMG_TRAP_ACTIVE 306 +#define IMG_DX_SUPABOMB 307 +#define IMG_KEY1 308 +#define IMG_KEY2 309 +#define IMG_KEY3 310 +#define IMG_KEY4 311 +#define IMG_GATE1 312 +#define IMG_GATE2 313 +#define IMG_GATE3 314 +#define IMG_GATE4 315 +#define IMG_GATE1_GRAY 316 +#define IMG_GATE2_GRAY 317 +#define IMG_GATE3_GRAY 318 +#define IMG_GATE4_GRAY 319 +#define IMG_GAMEOFLIFE 320 +#define IMG_BIOMAZE 321 +#define IMG_PACMAN_RIGHT 322 +#define IMG_PACMAN_UP 323 +#define IMG_PACMAN_LEFT 324 +#define IMG_PACMAN_DOWN 325 +#define IMG_LAMP 326 +#define IMG_LAMP_ACTIVE 327 +#define IMG_TIME_ORB_FULL 328 +#define IMG_TIME_ORB_EMPTY 329 +#define IMG_EMERALD_YELLOW 330 +#define IMG_EMERALD_YELLOW_MOVING 331 +#define IMG_EMERALD_YELLOW_FALLING 332 +#define IMG_EMERALD_RED 333 +#define IMG_EMERALD_RED_MOVING 334 +#define IMG_EMERALD_RED_FALLING 335 +#define IMG_EMERALD_PURPLE 336 +#define IMG_EMERALD_PURPLE_MOVING 337 +#define IMG_EMERALD_PURPLE_FALLING 338 +#define IMG_WALL_EMERALD_YELLOW 339 +#define IMG_WALL_EMERALD_RED 340 +#define IMG_WALL_EMERALD_PURPLE 341 +#define IMG_WALL_BD_DIAMOND 342 +#define IMG_WALL_GROWING 343 +#define IMG_WALL_GROWING_XY 344 +#define IMG_WALL_GROWING_X 345 +#define IMG_WALL_GROWING_Y 346 +#define IMG_WALL_GROWING_ACTIVE_LEFT 347 +#define IMG_WALL_GROWING_ACTIVE_RIGHT 348 +#define IMG_WALL_GROWING_ACTIVE_UP 349 +#define IMG_WALL_GROWING_ACTIVE_DOWN 350 +#define IMG_BLACK_ORB 351 +#define IMG_SPEED_PILL 352 +#define IMG_DARK_YAMYAM 353 +#define IMG_DYNABOMB_ACTIVE 354 +#define IMG_DYNABOMB_PLAYER1_ACTIVE 355 +#define IMG_DYNABOMB_PLAYER2_ACTIVE 356 +#define IMG_DYNABOMB_PLAYER3_ACTIVE 357 +#define IMG_DYNABOMB_PLAYER4_ACTIVE 358 +#define IMG_DYNABOMB_NR 359 +#define IMG_DYNABOMB_SZ 360 +#define IMG_DYNABOMB_XL 361 +#define IMG_PIG 362 +#define IMG_PIG_DOWN 363 +#define IMG_PIG_DOWN_MOVING 364 +#define IMG_PIG_DOWN_EATING 365 +#define IMG_PIG_UP 366 +#define IMG_PIG_UP_MOVING 367 +#define IMG_PIG_UP_EATING 368 +#define IMG_PIG_LEFT 369 +#define IMG_PIG_LEFT_MOVING 370 +#define IMG_PIG_LEFT_EATING 371 +#define IMG_PIG_RIGHT 372 +#define IMG_PIG_RIGHT_MOVING 373 +#define IMG_PIG_RIGHT_EATING 374 +#define IMG_DRAGON 375 +#define IMG_DRAGON_DOWN 376 +#define IMG_DRAGON_DOWN_MOVING 377 +#define IMG_DRAGON_DOWN_ATTACKING 378 +#define IMG_DRAGON_UP 379 +#define IMG_DRAGON_UP_MOVING 380 +#define IMG_DRAGON_UP_ATTACKING 381 +#define IMG_DRAGON_LEFT 382 +#define IMG_DRAGON_LEFT_MOVING 383 +#define IMG_DRAGON_LEFT_ATTACKING 384 +#define IMG_DRAGON_RIGHT 385 +#define IMG_DRAGON_RIGHT_MOVING 386 +#define IMG_DRAGON_RIGHT_ATTACKING 387 +#define IMG_MOLE 388 +#define IMG_MOLE_DOWN 389 +#define IMG_MOLE_DOWN_MOVING 390 +#define IMG_MOLE_DOWN_DIGGING 391 +#define IMG_MOLE_UP 392 +#define IMG_MOLE_UP_MOVING 393 +#define IMG_MOLE_UP_DIGGING 394 +#define IMG_MOLE_LEFT 395 +#define IMG_MOLE_LEFT_MOVING 396 +#define IMG_MOLE_LEFT_DIGGING 397 +#define IMG_MOLE_RIGHT 398 +#define IMG_MOLE_RIGHT_MOVING 399 +#define IMG_MOLE_RIGHT_DIGGING 400 +#define IMG_PENGUIN 401 +#define IMG_PENGUIN_DOWN 402 +#define IMG_PENGUIN_DOWN_MOVING 403 +#define IMG_PENGUIN_UP 404 +#define IMG_PENGUIN_UP_MOVING 405 +#define IMG_PENGUIN_LEFT 406 +#define IMG_PENGUIN_LEFT_MOVING 407 +#define IMG_PENGUIN_RIGHT 408 +#define IMG_PENGUIN_RIGHT_MOVING 409 +#define IMG_SATELLITE 410 +#define IMG_SATELLITE_MOVING 411 +#define IMG_FLAMES_LEFT1 412 +#define IMG_FLAMES_LEFT2 413 +#define IMG_FLAMES_LEFT3 414 +#define IMG_FLAMES_RIGHT1 415 +#define IMG_FLAMES_RIGHT2 416 +#define IMG_FLAMES_RIGHT3 417 +#define IMG_FLAMES_UP1 418 +#define IMG_FLAMES_UP2 419 +#define IMG_FLAMES_UP3 420 +#define IMG_FLAMES_DOWN1 421 +#define IMG_FLAMES_DOWN2 422 +#define IMG_FLAMES_DOWN3 423 +#define IMG_STONEBLOCK 424 +#define IMG_PLAYER1 425 +#define IMG_PLAYER1_DOWN 426 +#define IMG_PLAYER1_DOWN_MOVING 427 +#define IMG_PLAYER1_DOWN_DIGGING 428 +#define IMG_PLAYER1_DOWN_PUSHING 429 +#define IMG_PLAYER1_DOWN_SNAPPING 430 +#define IMG_PLAYER1_UP 431 +#define IMG_PLAYER1_UP_MOVING 432 +#define IMG_PLAYER1_UP_DIGGING 433 +#define IMG_PLAYER1_UP_PUSHING 434 +#define IMG_PLAYER1_UP_SNAPPING 435 +#define IMG_PLAYER1_LEFT 436 +#define IMG_PLAYER1_LEFT_MOVING 437 +#define IMG_PLAYER1_LEFT_DIGGING 438 +#define IMG_PLAYER1_LEFT_PUSHING 439 +#define IMG_PLAYER1_LEFT_SNAPPING 440 +#define IMG_PLAYER1_RIGHT 441 +#define IMG_PLAYER1_RIGHT_MOVING 442 +#define IMG_PLAYER1_RIGHT_DIGGING 443 +#define IMG_PLAYER1_RIGHT_PUSHING 444 +#define IMG_PLAYER1_RIGHT_SNAPPING 445 +#define IMG_PLAYER2 446 +#define IMG_PLAYER2_DOWN 447 +#define IMG_PLAYER2_DOWN_MOVING 448 +#define IMG_PLAYER2_DOWN_DIGGING 449 +#define IMG_PLAYER2_DOWN_PUSHING 450 +#define IMG_PLAYER2_DOWN_SNAPPING 451 +#define IMG_PLAYER2_UP 452 +#define IMG_PLAYER2_UP_MOVING 453 +#define IMG_PLAYER2_UP_DIGGING 454 +#define IMG_PLAYER2_UP_PUSHING 455 +#define IMG_PLAYER2_UP_SNAPPING 456 +#define IMG_PLAYER2_LEFT 457 +#define IMG_PLAYER2_LEFT_MOVING 458 +#define IMG_PLAYER2_LEFT_DIGGING 459 +#define IMG_PLAYER2_LEFT_PUSHING 460 +#define IMG_PLAYER2_LEFT_SNAPPING 461 +#define IMG_PLAYER2_RIGHT 462 +#define IMG_PLAYER2_RIGHT_MOVING 463 +#define IMG_PLAYER2_RIGHT_DIGGING 464 +#define IMG_PLAYER2_RIGHT_PUSHING 465 +#define IMG_PLAYER2_RIGHT_SNAPPING 466 +#define IMG_PLAYER3 467 +#define IMG_PLAYER3_DOWN 468 +#define IMG_PLAYER3_DOWN_MOVING 469 +#define IMG_PLAYER3_DOWN_DIGGING 470 +#define IMG_PLAYER3_DOWN_PUSHING 471 +#define IMG_PLAYER3_DOWN_SNAPPING 472 +#define IMG_PLAYER3_UP 473 +#define IMG_PLAYER3_UP_MOVING 474 +#define IMG_PLAYER3_UP_DIGGING 475 +#define IMG_PLAYER3_UP_PUSHING 476 +#define IMG_PLAYER3_UP_SNAPPING 477 +#define IMG_PLAYER3_LEFT 478 +#define IMG_PLAYER3_LEFT_MOVING 479 +#define IMG_PLAYER3_LEFT_DIGGING 480 +#define IMG_PLAYER3_LEFT_PUSHING 481 +#define IMG_PLAYER3_LEFT_SNAPPING 482 +#define IMG_PLAYER3_RIGHT 483 +#define IMG_PLAYER3_RIGHT_MOVING 484 +#define IMG_PLAYER3_RIGHT_DIGGING 485 +#define IMG_PLAYER3_RIGHT_PUSHING 486 +#define IMG_PLAYER3_RIGHT_SNAPPING 487 +#define IMG_PLAYER4 488 +#define IMG_PLAYER4_DOWN 489 +#define IMG_PLAYER4_DOWN_MOVING 490 +#define IMG_PLAYER4_DOWN_DIGGING 491 +#define IMG_PLAYER4_DOWN_PUSHING 492 +#define IMG_PLAYER4_DOWN_SNAPPING 493 +#define IMG_PLAYER4_UP 494 +#define IMG_PLAYER4_UP_MOVING 495 +#define IMG_PLAYER4_UP_DIGGING 496 +#define IMG_PLAYER4_UP_PUSHING 497 +#define IMG_PLAYER4_UP_SNAPPING 498 +#define IMG_PLAYER4_LEFT 499 +#define IMG_PLAYER4_LEFT_MOVING 500 +#define IMG_PLAYER4_LEFT_DIGGING 501 +#define IMG_PLAYER4_LEFT_PUSHING 502 +#define IMG_PLAYER4_LEFT_SNAPPING 503 +#define IMG_PLAYER4_RIGHT 504 +#define IMG_PLAYER4_RIGHT_MOVING 505 +#define IMG_PLAYER4_RIGHT_DIGGING 506 +#define IMG_PLAYER4_RIGHT_PUSHING 507 +#define IMG_PLAYER4_RIGHT_SNAPPING 508 +#define IMG_EXPLOSION 509 +#define IMG_TWINKLE_BLUE 510 +#define IMG_TWINKLE_WHITE 511 +#define IMG_STEELWALL_TOPLEFT 512 +#define IMG_STEELWALL_TOPRIGHT 513 +#define IMG_STEELWALL_BOTTOMLEFT 514 +#define IMG_STEELWALL_BOTTOMRIGHT 515 +#define IMG_STEELWALL_HORIZONTAL 516 +#define IMG_STEELWALL_VERTICAL 517 +#define IMG_INVISIBLE_STEELWALL_TOPLEFT 518 +#define IMG_INVISIBLE_STEELWALL_TOPRIGHT 519 +#define IMG_INVISIBLE_STEELWALL_BOTTOMLEFT 520 +#define IMG_INVISIBLE_STEELWALL_BOTTOMRIGHT 521 +#define IMG_INVISIBLE_STEELWALL_HORIZONTAL 522 +#define IMG_INVISIBLE_STEELWALL_VERTICAL 523 +#define IMG_ARROW_BLUE_LEFT 524 +#define IMG_ARROW_BLUE_RIGHT 525 +#define IMG_ARROW_BLUE_UP 526 +#define IMG_ARROW_BLUE_DOWN 527 +#define IMG_ARROW_RED_LEFT 528 +#define IMG_ARROW_RED_RIGHT 529 +#define IMG_ARROW_RED_UP 530 +#define IMG_ARROW_RED_DOWN 531 +#define IMG_BALL_RED 532 +#define IMG_BALL_BLUE 533 +#define IMG_BALL_YELLOW 534 +#define IMG_BALL_GRAY 535 +#define IMG_SCROLLBAR_BLUE 536 +#define IMG_SCROLLBAR_RED 537 +#define IMG_SCROLLBAR_GREEN 538 +#define IMG_SCROLLBAR_YELLOW 539 +#define IMG_CHAR_SPACE 540 +#define IMG_CHAR_EXCLAM 541 +#define IMG_CHAR_QUOTEDBL 542 +#define IMG_CHAR_NUMBERSIGN 543 +#define IMG_CHAR_DOLLAR 544 +#define IMG_CHAR_PROCENT 545 +#define IMG_CHAR_AMPERSAND 546 +#define IMG_CHAR_APOSTROPHE 547 +#define IMG_CHAR_PARENLEFT 548 +#define IMG_CHAR_PARENRIGHT 549 +#define IMG_CHAR_ASTERISK 550 +#define IMG_CHAR_PLUS 551 +#define IMG_CHAR_COMMA 552 +#define IMG_CHAR_MINUS 553 +#define IMG_CHAR_PERIOD 554 +#define IMG_CHAR_SLASH 555 +#define IMG_CHAR_0 556 +#define IMG_CHAR_1 557 +#define IMG_CHAR_2 558 +#define IMG_CHAR_3 559 +#define IMG_CHAR_4 560 +#define IMG_CHAR_5 561 +#define IMG_CHAR_6 562 +#define IMG_CHAR_7 563 +#define IMG_CHAR_8 564 +#define IMG_CHAR_9 565 +#define IMG_CHAR_COLON 566 +#define IMG_CHAR_SEMICOLON 567 +#define IMG_CHAR_LESS 568 +#define IMG_CHAR_EQUAL 569 +#define IMG_CHAR_GREATER 570 +#define IMG_CHAR_QUESTION 571 +#define IMG_CHAR_AT 572 +#define IMG_CHAR_A 573 +#define IMG_CHAR_B 574 +#define IMG_CHAR_C 575 +#define IMG_CHAR_D 576 +#define IMG_CHAR_E 577 +#define IMG_CHAR_F 578 +#define IMG_CHAR_G 579 +#define IMG_CHAR_H 580 +#define IMG_CHAR_I 581 +#define IMG_CHAR_J 582 +#define IMG_CHAR_K 583 +#define IMG_CHAR_L 584 +#define IMG_CHAR_M 585 +#define IMG_CHAR_N 586 +#define IMG_CHAR_O 587 +#define IMG_CHAR_P 588 +#define IMG_CHAR_Q 589 +#define IMG_CHAR_R 590 +#define IMG_CHAR_S 591 +#define IMG_CHAR_T 592 +#define IMG_CHAR_U 593 +#define IMG_CHAR_V 594 +#define IMG_CHAR_W 595 +#define IMG_CHAR_X 596 +#define IMG_CHAR_Y 597 +#define IMG_CHAR_Z 598 +#define IMG_CHAR_AE 599 +#define IMG_CHAR_OE 600 +#define IMG_CHAR_UE 601 +#define IMG_CHAR_COPYRIGHT 602 +#define IMG_CHAR_UNDERSCORE 603 +#define IMG_CHAR_EMPTY 604 +#define IMG_CHAR_DEGREE 605 +#define IMG_CHAR_TM 606 +#define IMG_CHAR_CURSOR 607 +#define IMG_CUSTOM_0 608 +#define IMG_CUSTOM_1 609 +#define IMG_CUSTOM_2 610 +#define IMG_CUSTOM_3 611 +#define IMG_CUSTOM_4 612 +#define IMG_CUSTOM_5 613 +#define IMG_CUSTOM_6 614 +#define IMG_CUSTOM_7 615 +#define IMG_CUSTOM_8 616 +#define IMG_CUSTOM_9 617 +#define IMG_CUSTOM_10 618 +#define IMG_CUSTOM_11 619 +#define IMG_CUSTOM_12 620 +#define IMG_CUSTOM_13 621 +#define IMG_CUSTOM_14 622 +#define IMG_CUSTOM_15 623 +#define IMG_CUSTOM_16 624 +#define IMG_CUSTOM_17 625 +#define IMG_CUSTOM_18 626 +#define IMG_CUSTOM_19 627 +#define IMG_CUSTOM_20 628 +#define IMG_CUSTOM_21 629 +#define IMG_CUSTOM_22 630 +#define IMG_CUSTOM_23 631 +#define IMG_CUSTOM_24 632 +#define IMG_CUSTOM_25 633 +#define IMG_CUSTOM_26 634 +#define IMG_CUSTOM_27 635 +#define IMG_CUSTOM_28 636 +#define IMG_CUSTOM_29 637 +#define IMG_CUSTOM_30 638 +#define IMG_CUSTOM_31 639 +#define IMG_CUSTOM_32 640 +#define IMG_CUSTOM_33 641 +#define IMG_CUSTOM_34 642 +#define IMG_CUSTOM_35 643 +#define IMG_CUSTOM_36 644 +#define IMG_CUSTOM_37 645 +#define IMG_CUSTOM_38 646 +#define IMG_CUSTOM_39 647 +#define IMG_CUSTOM_40 648 +#define IMG_CUSTOM_41 649 +#define IMG_CUSTOM_42 650 +#define IMG_CUSTOM_43 651 +#define IMG_CUSTOM_44 652 +#define IMG_CUSTOM_45 653 +#define IMG_CUSTOM_46 654 +#define IMG_CUSTOM_47 655 +#define IMG_CUSTOM_48 656 +#define IMG_CUSTOM_49 657 +#define IMG_CUSTOM_50 658 +#define IMG_CUSTOM_51 659 +#define IMG_CUSTOM_52 660 +#define IMG_CUSTOM_53 661 +#define IMG_CUSTOM_54 662 +#define IMG_CUSTOM_55 663 +#define IMG_CUSTOM_56 664 +#define IMG_CUSTOM_57 665 +#define IMG_CUSTOM_58 666 +#define IMG_CUSTOM_59 667 +#define IMG_CUSTOM_60 668 +#define IMG_CUSTOM_61 669 +#define IMG_CUSTOM_62 670 +#define IMG_CUSTOM_63 671 +#define IMG_CUSTOM_64 672 +#define IMG_CUSTOM_65 673 +#define IMG_CUSTOM_66 674 +#define IMG_CUSTOM_67 675 +#define IMG_CUSTOM_68 676 +#define IMG_CUSTOM_69 677 +#define IMG_CUSTOM_70 678 +#define IMG_CUSTOM_71 679 +#define IMG_CUSTOM_72 680 +#define IMG_CUSTOM_73 681 +#define IMG_CUSTOM_74 682 +#define IMG_CUSTOM_75 683 +#define IMG_CUSTOM_76 684 +#define IMG_CUSTOM_77 685 +#define IMG_CUSTOM_78 686 +#define IMG_CUSTOM_79 687 +#define IMG_CUSTOM_80 688 +#define IMG_CUSTOM_81 689 +#define IMG_CUSTOM_82 690 +#define IMG_CUSTOM_83 691 +#define IMG_CUSTOM_84 692 +#define IMG_CUSTOM_85 693 +#define IMG_CUSTOM_86 694 +#define IMG_CUSTOM_87 695 +#define IMG_CUSTOM_88 696 +#define IMG_CUSTOM_89 697 +#define IMG_CUSTOM_90 698 +#define IMG_CUSTOM_91 699 +#define IMG_CUSTOM_92 700 +#define IMG_CUSTOM_93 701 +#define IMG_CUSTOM_94 702 +#define IMG_CUSTOM_95 703 +#define IMG_CUSTOM_96 704 +#define IMG_CUSTOM_97 705 +#define IMG_CUSTOM_98 706 +#define IMG_CUSTOM_99 707 +#define IMG_CUSTOM_100 708 +#define IMG_CUSTOM_101 709 +#define IMG_CUSTOM_102 710 +#define IMG_CUSTOM_103 711 +#define IMG_CUSTOM_104 712 +#define IMG_CUSTOM_105 713 +#define IMG_CUSTOM_106 714 +#define IMG_CUSTOM_107 715 +#define IMG_CUSTOM_108 716 +#define IMG_CUSTOM_109 717 +#define IMG_CUSTOM_110 718 +#define IMG_CUSTOM_111 719 +#define IMG_CUSTOM_112 720 +#define IMG_CUSTOM_113 721 +#define IMG_CUSTOM_114 722 +#define IMG_CUSTOM_115 723 +#define IMG_CUSTOM_116 724 +#define IMG_CUSTOM_117 725 +#define IMG_CUSTOM_118 726 +#define IMG_CUSTOM_119 727 +#define IMG_CUSTOM_120 728 +#define IMG_CUSTOM_121 729 +#define IMG_CUSTOM_122 730 +#define IMG_CUSTOM_123 731 +#define IMG_CUSTOM_124 732 +#define IMG_CUSTOM_125 733 +#define IMG_CUSTOM_126 734 +#define IMG_CUSTOM_127 735 +#define IMG_MENU_FRAME 736 +#define IMG_MENU_BACK 737 +#define IMG_MENU_DOOR 738 +#define IMG_MENU_TOONS 739 +#define IMG_MENU_FONT_BIG 740 +#define IMG_MENU_FONT_SMALL 741 +#define IMG_MENU_FONT_MEDIUM 742 +#define IMG_MENU_FONT_EM 743 +#define IMG_INFO_FONT_EM_1 744 +#define IMG_INFO_FONT_EM_2 745 +#define IMG_INFO_FONT_EM_3 746 +#define IMG_INFO_FONT_EM_4 747 +#define IMG_INFO_FONT_EM_5 748 -#define NUM_IMAGE_FILES 745 +#define NUM_IMAGE_FILES 749 #endif /* CONF_GFX_H */ diff --git a/src/conftime.h b/src/conftime.h index 924ee24e..7f6fc6d3 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "[2003-01-04 01:24]" +#define COMPILE_DATE_STRING "[2003-01-04 04:16]" diff --git a/src/editor.c b/src/editor.c index e8201e30..c6b2632a 100644 --- a/src/editor.c +++ b/src/editor.c @@ -2651,6 +2651,12 @@ static void PickDrawingElement(int button, int element) static void DrawDrawingWindow() { ClearWindow(); + +#if 1 + ClearRectangle(backbuffer, REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE); + redraw_mask |= REDRAW_FROM_BACKBUFFER; +#endif + UnmapLevelEditorWindowGadgets(); AdjustDrawingAreaGadgets(); AdjustLevelScrollPosition(); diff --git a/src/events.c b/src/events.c index e97d0f98..bb28e127 100644 --- a/src/events.c +++ b/src/events.c @@ -127,6 +127,8 @@ void HandleOtherEvents(Event *event) case EVENT_UNMAPNOTIFY: #if 0 + /* This causes the game to stop not only when iconified, but also + when on another virtual desktop, which might be not desired. */ SleepWhileUnmapped(); #endif break; diff --git a/src/game.c b/src/game.c index b135360d..afd56998 100644 --- a/src/game.c +++ b/src/game.c @@ -962,7 +962,6 @@ void InitGame() DrawLevel(); DrawAllPlayers(); - FadeToFront(); /* after drawing the level, correct some elements */ if (game.timegate_time_left == 0) @@ -972,6 +971,7 @@ void InitGame() BlitBitmap(fieldbuffer, backbuffer, FX, FY, SXSIZE, SYSIZE, SX, SY); redraw_mask |= REDRAW_FROM_BACKBUFFER; + FadeToFront(); /* copy default game door content to main double buffer */ BlitBitmap(new_graphic_info[IMG_MENU_DOOR].bitmap, drawto, diff --git a/src/init.c b/src/init.c index 66083aeb..123b8205 100644 --- a/src/init.c +++ b/src/init.c @@ -481,7 +481,7 @@ void InitGfxBackground() fieldbuffer = bitmap_db_field; SetDrawtoField(DRAW_BACKBUFFER); - BlitBitmap(new_graphic_info[IMG_MENU_BACK].bitmap, backbuffer, + BlitBitmap(new_graphic_info[IMG_MENU_FRAME].bitmap, backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0); ClearRectangle(backbuffer, REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE); ClearRectangle(bitmap_db_door, 0, 0, 3 * DXSIZE, DYSIZE + VYSIZE); @@ -871,6 +871,9 @@ static void InitGraphicInfo() /* now check if no animation frames are outside of the loaded image */ + if (new_graphic_info[i].bitmap == NULL) + continue; /* skip check for optional images */ + first_frame = 0; getGraphicSource(i, first_frame, &src_bitmap, &src_x, &src_y); if (src_x < 0 || src_y < 0 || diff --git a/src/libgame/image.c b/src/libgame/image.c index a649e40a..da60a405 100644 --- a/src/libgame/image.c +++ b/src/libgame/image.c @@ -705,7 +705,7 @@ Bitmap *getBitmapFromImageID(int graphic) { ImageInfo **img_info = (ImageInfo **)image_info->artwork_list; - return img_info[graphic]->bitmap; + return (img_info[graphic] != NULL ? img_info[graphic]->bitmap : NULL); } char *getTokenFromImageID(int graphic) diff --git a/src/libgame/misc.c b/src/libgame/misc.c index b5dfab4b..bde3ea63 100644 --- a/src/libgame/misc.c +++ b/src/libgame/misc.c @@ -1374,6 +1374,7 @@ struct FileInfo *getFileListFromConfigList(struct ConfigInfo *config_list, int num_file_list_entries) { struct FileInfo *file_list; + int num_file_list_entries_found = 0; int num_suffix_list_entries = 0; int list_pos = 0; int i, j; @@ -1433,7 +1434,7 @@ struct FileInfo *getFileListFromConfigList(struct ConfigInfo *config_list, if (i > 0) list_pos++; - if (list_pos > num_file_list_entries - 1) + if (list_pos >= num_file_list_entries) break; /* simple sanity check if this is really a file definition */ @@ -1451,8 +1452,16 @@ struct FileInfo *getFileListFromConfigList(struct ConfigInfo *config_list, } } - if (list_pos != num_file_list_entries - 1) - Error(ERR_EXIT, "inconsistant config list information (%d != %d) -- please fix", list_pos, num_file_list_entries - 1); + num_file_list_entries_found = list_pos + 1; + if (num_file_list_entries_found != num_file_list_entries) + { + Error(ERR_RETURN, "inconsistant config list information:"); + Error(ERR_RETURN, "- should be: %d (according to 'src/conf_gfx.h')", + num_file_list_entries); + Error(ERR_RETURN, "- found to be: %d (according to 'src/conf_gfx.c')", + num_file_list_entries_found); + Error(ERR_EXIT, "please fix"); + } return file_list; } diff --git a/src/libgame/text.c b/src/libgame/text.c index 414c1877..2a70134b 100644 --- a/src/libgame/text.c +++ b/src/libgame/text.c @@ -200,8 +200,17 @@ void DrawTextExt(DrawBuffer *bitmap, int x, int y, char *text, 0, 0, font_width, font_height, dest_x, dest_y); } else - BlitBitmap(font_bitmap, bitmap, - src_x, src_y, font_width, font_height, dest_x, dest_y); + { +#if 1 + BlitBitmap(font_bitmap, bitmap, src_x, src_y, + font_width, font_height, dest_x, dest_y); +#else + SetClipOrigin(font_bitmap, font_bitmap->stored_clip_gc, + dest_x - src_x, dest_y - src_y); + BlitBitmapMasked(font_bitmap, bitmap, src_x, src_y, + font_width, font_height, dest_x, dest_y); +#endif + } } x += font_width; diff --git a/src/screens.c b/src/screens.c index bc8f64ec..3e58f59c 100644 --- a/src/screens.c +++ b/src/screens.c @@ -119,7 +119,7 @@ static void ToggleFullscreenIfNeeded() setup.fullscreen = video.fullscreen_enabled; /* redraw background to newly created backbuffer */ - BlitBitmap(new_graphic_info[IMG_MENU_BACK].bitmap, backbuffer, + BlitBitmap(new_graphic_info[IMG_MENU_FRAME].bitmap, backbuffer, 0,0, WIN_XSIZE,WIN_YSIZE, 0,0); /* restore old door content */ diff --git a/src/tools.c b/src/tools.c index ebb52194..53336c7f 100644 --- a/src/tools.c +++ b/src/tools.c @@ -380,6 +380,13 @@ void ClearWindow() SetDrawtoField(DRAW_DIRECT); } +#if 1 + if (game_status != PLAYING && + new_graphic_info[IMG_MENU_BACK].bitmap != NULL) + BlitBitmap(new_graphic_info[IMG_MENU_BACK].bitmap, backbuffer, + 0, 0, FULL_SXSIZE, FULL_SYSIZE, REAL_SX, REAL_SY); +#endif + redraw_mask |= REDRAW_FIELD; } @@ -669,9 +676,7 @@ void DrawPlayer(struct PlayerInfo *player) int frame = 0; #endif - if ((element == EL_ROCK || - element == EL_BD_ROCK || - element == EL_SP_ZONK) && sxx) + if (sxx && IS_PUSHABLE(element)) { graphic = el_dir_act2img(element, player->MovDir, GFX_ACTION_MOVING); #if 1 @@ -2397,7 +2402,7 @@ void DrawSpecialEditorDoor() BlitBitmap(new_graphic_info[IMG_MENU_DOOR].bitmap, drawto, DOOR_GFX_PAGEX7, 0, EXSIZE + 8, 8, EX - 4, EY - 12); - BlitBitmap(new_graphic_info[IMG_MENU_BACK].bitmap, drawto, + BlitBitmap(new_graphic_info[IMG_MENU_FRAME].bitmap, drawto, EX - 4, VY - 4, EXSIZE + 8, EYSIZE - VYSIZE + 4, EX - 4, EY - 4); @@ -2407,7 +2412,7 @@ void DrawSpecialEditorDoor() void UndrawSpecialEditorDoor() { /* draw normal tape recorder window */ - BlitBitmap(new_graphic_info[IMG_MENU_BACK].bitmap, drawto, + BlitBitmap(new_graphic_info[IMG_MENU_FRAME].bitmap, drawto, EX - 4, EY - 12, EXSIZE + 8, EYSIZE - VYSIZE + 12, EX - 4, EY - 12); -- 2.34.1