From: Holger Schemel Date: Thu, 4 Dec 2003 23:53:43 +0000 (+0100) Subject: rnd-20031205-B-src X-Git-Tag: 3.0.8^2~6 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=942ec4881e3b21c130df9ae105d06c2c633fa192;p=rocksndiamonds.git rnd-20031205-B-src --- diff --git a/Makefile b/Makefile index 0c0c57f4..ddb3f97d 100644 --- a/Makefile +++ b/Makefile @@ -50,8 +50,8 @@ CROSS_PATH_WIN32=/usr/local/cross-tools/i386-mingw32msvc SRC_DIR = src MAKE_CMD = $(MAKE) -C $(SRC_DIR) -# DEFAULT_TARGET = x11 -DEFAULT_TARGET = sdl +DEFAULT_TARGET = x11 +# DEFAULT_TARGET = sdl # ----------------------------------------------------------------------------- diff --git a/src/Makefile b/src/Makefile index 16c6cd6a..0512cf80 100644 --- a/src/Makefile +++ b/src/Makefile @@ -41,6 +41,7 @@ PROGNAME = ../$(PROGBASE).exe SYS_CFLAGS = -DTARGET_X11 SYS_LDFLAGS = -s -lalleg + else # Unix or cross-compiling for MS-DOS and Win32 RM = rm -f @@ -76,7 +77,8 @@ endif ifeq ($(TARGET),x11) SYS_CFLAGS = -DTARGET_X11 $(X11_INCL) -SYS_LDFLAGS = $(X11_LIBS) -lX11 +# SYS_LDFLAGS = $(X11_LIBS) -lX11 +SYS_LDFLAGS = $(XLIB_PATH)/libX11.a endif ifeq ($(TARGET),sdl) diff --git a/src/conf_e2g.c b/src/conf_e2g.c index 34ea8a3f..2a70f7b8 100644 --- a/src/conf_e2g.c +++ b/src/conf_e2g.c @@ -2049,6 +2049,10 @@ element_to_graphic[] = EL_STONEBLOCK, -1, -1, FALSE, IMG_STONEBLOCK }, + { + EL_MAZE_RUNNER, -1, -1, FALSE, + IMG_MAZE_RUNNER + }, { EL_PLAYER_1, -1, -1, FALSE, IMG_PLAYER_1 diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 412c52d5..984c0972 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -2467,6 +2467,11 @@ struct ConfigInfo image_config[] = { "stoneblock.ypos", "1" }, { "stoneblock.frames", "1" }, + { "maze_runner", "RocksHeroes.pcx" }, + { "maze_runner.xpos", "15" }, + { "maze_runner.ypos", "8" }, + { "maze_runner.frames", "1" }, + /* images for other elements and actions */ { "player_1", "RocksHeroes.pcx" }, diff --git a/src/conf_gfx.h b/src/conf_gfx.h index 90ff4a1a..6025aada 100644 --- a/src/conf_gfx.h +++ b/src/conf_gfx.h @@ -514,823 +514,824 @@ #define IMG_FLAMES_2_DOWN 493 #define IMG_FLAMES_3_DOWN 494 #define IMG_STONEBLOCK 495 -#define IMG_PLAYER_1 496 -#define IMG_PLAYER_1_EDITOR 497 -#define IMG_PLAYER_1_DOWN 498 -#define IMG_PLAYER_1_UP 499 -#define IMG_PLAYER_1_LEFT 500 -#define IMG_PLAYER_1_RIGHT 501 -#define IMG_PLAYER_1_MOVING_DOWN 502 -#define IMG_PLAYER_1_MOVING_UP 503 -#define IMG_PLAYER_1_MOVING_LEFT 504 -#define IMG_PLAYER_1_MOVING_RIGHT 505 -#define IMG_PLAYER_1_DIGGING_DOWN 506 -#define IMG_PLAYER_1_DIGGING_UP 507 -#define IMG_PLAYER_1_DIGGING_LEFT 508 -#define IMG_PLAYER_1_DIGGING_RIGHT 509 -#define IMG_PLAYER_1_COLLECTING_DOWN 510 -#define IMG_PLAYER_1_COLLECTING_UP 511 -#define IMG_PLAYER_1_COLLECTING_LEFT 512 -#define IMG_PLAYER_1_COLLECTING_RIGHT 513 -#define IMG_PLAYER_1_PUSHING_DOWN 514 -#define IMG_PLAYER_1_PUSHING_UP 515 -#define IMG_PLAYER_1_PUSHING_LEFT 516 -#define IMG_PLAYER_1_PUSHING_RIGHT 517 -#define IMG_PLAYER_1_SNAPPING_DOWN 518 -#define IMG_PLAYER_1_SNAPPING_UP 519 -#define IMG_PLAYER_1_SNAPPING_LEFT 520 -#define IMG_PLAYER_1_SNAPPING_RIGHT 521 -#define IMG_PLAYER_2 522 -#define IMG_PLAYER_2_EDITOR 523 -#define IMG_PLAYER_2_DOWN 524 -#define IMG_PLAYER_2_UP 525 -#define IMG_PLAYER_2_LEFT 526 -#define IMG_PLAYER_2_RIGHT 527 -#define IMG_PLAYER_2_MOVING_DOWN 528 -#define IMG_PLAYER_2_MOVING_UP 529 -#define IMG_PLAYER_2_MOVING_LEFT 530 -#define IMG_PLAYER_2_MOVING_RIGHT 531 -#define IMG_PLAYER_2_DIGGING_DOWN 532 -#define IMG_PLAYER_2_DIGGING_UP 533 -#define IMG_PLAYER_2_DIGGING_LEFT 534 -#define IMG_PLAYER_2_DIGGING_RIGHT 535 -#define IMG_PLAYER_2_COLLECTING_DOWN 536 -#define IMG_PLAYER_2_COLLECTING_UP 537 -#define IMG_PLAYER_2_COLLECTING_LEFT 538 -#define IMG_PLAYER_2_COLLECTING_RIGHT 539 -#define IMG_PLAYER_2_PUSHING_DOWN 540 -#define IMG_PLAYER_2_PUSHING_UP 541 -#define IMG_PLAYER_2_PUSHING_LEFT 542 -#define IMG_PLAYER_2_PUSHING_RIGHT 543 -#define IMG_PLAYER_2_SNAPPING_DOWN 544 -#define IMG_PLAYER_2_SNAPPING_UP 545 -#define IMG_PLAYER_2_SNAPPING_LEFT 546 -#define IMG_PLAYER_2_SNAPPING_RIGHT 547 -#define IMG_PLAYER_3 548 -#define IMG_PLAYER_3_EDITOR 549 -#define IMG_PLAYER_3_DOWN 550 -#define IMG_PLAYER_3_UP 551 -#define IMG_PLAYER_3_LEFT 552 -#define IMG_PLAYER_3_RIGHT 553 -#define IMG_PLAYER_3_MOVING_DOWN 554 -#define IMG_PLAYER_3_MOVING_UP 555 -#define IMG_PLAYER_3_MOVING_LEFT 556 -#define IMG_PLAYER_3_MOVING_RIGHT 557 -#define IMG_PLAYER_3_DIGGING_DOWN 558 -#define IMG_PLAYER_3_DIGGING_UP 559 -#define IMG_PLAYER_3_DIGGING_LEFT 560 -#define IMG_PLAYER_3_DIGGING_RIGHT 561 -#define IMG_PLAYER_3_COLLECTING_DOWN 562 -#define IMG_PLAYER_3_COLLECTING_UP 563 -#define IMG_PLAYER_3_COLLECTING_LEFT 564 -#define IMG_PLAYER_3_COLLECTING_RIGHT 565 -#define IMG_PLAYER_3_PUSHING_DOWN 566 -#define IMG_PLAYER_3_PUSHING_UP 567 -#define IMG_PLAYER_3_PUSHING_LEFT 568 -#define IMG_PLAYER_3_PUSHING_RIGHT 569 -#define IMG_PLAYER_3_SNAPPING_DOWN 570 -#define IMG_PLAYER_3_SNAPPING_UP 571 -#define IMG_PLAYER_3_SNAPPING_LEFT 572 -#define IMG_PLAYER_3_SNAPPING_RIGHT 573 -#define IMG_PLAYER_4 574 -#define IMG_PLAYER_4_EDITOR 575 -#define IMG_PLAYER_4_DOWN 576 -#define IMG_PLAYER_4_UP 577 -#define IMG_PLAYER_4_LEFT 578 -#define IMG_PLAYER_4_RIGHT 579 -#define IMG_PLAYER_4_MOVING_DOWN 580 -#define IMG_PLAYER_4_MOVING_UP 581 -#define IMG_PLAYER_4_MOVING_LEFT 582 -#define IMG_PLAYER_4_MOVING_RIGHT 583 -#define IMG_PLAYER_4_DIGGING_DOWN 584 -#define IMG_PLAYER_4_DIGGING_UP 585 -#define IMG_PLAYER_4_DIGGING_LEFT 586 -#define IMG_PLAYER_4_DIGGING_RIGHT 587 -#define IMG_PLAYER_4_COLLECTING_DOWN 588 -#define IMG_PLAYER_4_COLLECTING_UP 589 -#define IMG_PLAYER_4_COLLECTING_LEFT 590 -#define IMG_PLAYER_4_COLLECTING_RIGHT 591 -#define IMG_PLAYER_4_PUSHING_DOWN 592 -#define IMG_PLAYER_4_PUSHING_UP 593 -#define IMG_PLAYER_4_PUSHING_LEFT 594 -#define IMG_PLAYER_4_PUSHING_RIGHT 595 -#define IMG_PLAYER_4_SNAPPING_DOWN 596 -#define IMG_PLAYER_4_SNAPPING_UP 597 -#define IMG_PLAYER_4_SNAPPING_LEFT 598 -#define IMG_PLAYER_4_SNAPPING_RIGHT 599 -#define IMG_DEFAULT_EXPLODING 600 -#define IMG_TWINKLE_BLUE 601 -#define IMG_TWINKLE_WHITE 602 -#define IMG_STEELWALL_TOPLEFT 603 -#define IMG_STEELWALL_TOPRIGHT 604 -#define IMG_STEELWALL_BOTTOMLEFT 605 -#define IMG_STEELWALL_BOTTOMRIGHT 606 -#define IMG_STEELWALL_HORIZONTAL 607 -#define IMG_STEELWALL_VERTICAL 608 -#define IMG_STEELWALL_TOPLEFT_EDITOR 609 -#define IMG_STEELWALL_TOPRIGHT_EDITOR 610 -#define IMG_STEELWALL_BOTTOMLEFT_EDITOR 611 -#define IMG_STEELWALL_BOTTOMRIGHT_EDITOR 612 -#define IMG_STEELWALL_HORIZONTAL_EDITOR 613 -#define IMG_STEELWALL_VERTICAL_EDITOR 614 -#define IMG_INVISIBLE_STEELWALL_TOPLEFT 615 -#define IMG_INVISIBLE_STEELWALL_TOPRIGHT 616 -#define IMG_INVISIBLE_STEELWALL_BOTTOMLEFT 617 -#define IMG_INVISIBLE_STEELWALL_BOTTOMRIGHT 618 -#define IMG_INVISIBLE_STEELWALL_HORIZONTAL 619 -#define IMG_INVISIBLE_STEELWALL_VERTICAL 620 -#define IMG_INVISIBLE_STEELWALL_TOPLEFT_EDITOR 621 -#define IMG_INVISIBLE_STEELWALL_TOPRIGHT_EDITOR 622 -#define IMG_INVISIBLE_STEELWALL_BOTTOMLEFT_EDITOR 623 -#define IMG_INVISIBLE_STEELWALL_BOTTOMRIGHT_EDITOR 624 -#define IMG_INVISIBLE_STEELWALL_HORIZONTAL_EDITOR 625 -#define IMG_INVISIBLE_STEELWALL_VERTICAL_EDITOR 626 -#define IMG_ARROW_LEFT 627 -#define IMG_ARROW_RIGHT 628 -#define IMG_ARROW_UP 629 -#define IMG_ARROW_DOWN 630 -#define IMG_CHAR_SPACE 631 -#define IMG_CHAR_EXCLAM 632 -#define IMG_CHAR_QUOTEDBL 633 -#define IMG_CHAR_NUMBERSIGN 634 -#define IMG_CHAR_DOLLAR 635 -#define IMG_CHAR_PROCENT 636 -#define IMG_CHAR_AMPERSAND 637 -#define IMG_CHAR_APOSTROPHE 638 -#define IMG_CHAR_PARENLEFT 639 -#define IMG_CHAR_PARENRIGHT 640 -#define IMG_CHAR_ASTERISK 641 -#define IMG_CHAR_PLUS 642 -#define IMG_CHAR_COMMA 643 -#define IMG_CHAR_MINUS 644 -#define IMG_CHAR_PERIOD 645 -#define IMG_CHAR_SLASH 646 -#define IMG_CHAR_0 647 -#define IMG_CHAR_1 648 -#define IMG_CHAR_2 649 -#define IMG_CHAR_3 650 -#define IMG_CHAR_4 651 -#define IMG_CHAR_5 652 -#define IMG_CHAR_6 653 -#define IMG_CHAR_7 654 -#define IMG_CHAR_8 655 -#define IMG_CHAR_9 656 -#define IMG_CHAR_COLON 657 -#define IMG_CHAR_SEMICOLON 658 -#define IMG_CHAR_LESS 659 -#define IMG_CHAR_EQUAL 660 -#define IMG_CHAR_GREATER 661 -#define IMG_CHAR_QUESTION 662 -#define IMG_CHAR_AT 663 -#define IMG_CHAR_A 664 -#define IMG_CHAR_B 665 -#define IMG_CHAR_C 666 -#define IMG_CHAR_D 667 -#define IMG_CHAR_E 668 -#define IMG_CHAR_F 669 -#define IMG_CHAR_G 670 -#define IMG_CHAR_H 671 -#define IMG_CHAR_I 672 -#define IMG_CHAR_J 673 -#define IMG_CHAR_K 674 -#define IMG_CHAR_L 675 -#define IMG_CHAR_M 676 -#define IMG_CHAR_N 677 -#define IMG_CHAR_O 678 -#define IMG_CHAR_P 679 -#define IMG_CHAR_Q 680 -#define IMG_CHAR_R 681 -#define IMG_CHAR_S 682 -#define IMG_CHAR_T 683 -#define IMG_CHAR_U 684 -#define IMG_CHAR_V 685 -#define IMG_CHAR_W 686 -#define IMG_CHAR_X 687 -#define IMG_CHAR_Y 688 -#define IMG_CHAR_Z 689 -#define IMG_CHAR_BRACKETLEFT 690 -#define IMG_CHAR_BACKSLASH 691 -#define IMG_CHAR_BRACKETRIGHT 692 -#define IMG_CHAR_ASCIICIRCUM 693 -#define IMG_CHAR_UNDERSCORE 694 -#define IMG_CHAR_COPYRIGHT 695 -#define IMG_CHAR_AUMLAUT 696 -#define IMG_CHAR_OUMLAUT 697 -#define IMG_CHAR_UUMLAUT 698 -#define IMG_CHAR_DEGREE 699 -#define IMG_CHAR_TRADEMARK 700 -#define IMG_CHAR_CURSOR 701 -#define IMG_CUSTOM_1 702 -#define IMG_CUSTOM_1_EDITOR 703 -#define IMG_CUSTOM_2 704 -#define IMG_CUSTOM_2_EDITOR 705 -#define IMG_CUSTOM_3 706 -#define IMG_CUSTOM_3_EDITOR 707 -#define IMG_CUSTOM_4 708 -#define IMG_CUSTOM_4_EDITOR 709 -#define IMG_CUSTOM_5 710 -#define IMG_CUSTOM_5_EDITOR 711 -#define IMG_CUSTOM_6 712 -#define IMG_CUSTOM_6_EDITOR 713 -#define IMG_CUSTOM_7 714 -#define IMG_CUSTOM_7_EDITOR 715 -#define IMG_CUSTOM_8 716 -#define IMG_CUSTOM_8_EDITOR 717 -#define IMG_CUSTOM_9 718 -#define IMG_CUSTOM_9_EDITOR 719 -#define IMG_CUSTOM_10 720 -#define IMG_CUSTOM_10_EDITOR 721 -#define IMG_CUSTOM_11 722 -#define IMG_CUSTOM_11_EDITOR 723 -#define IMG_CUSTOM_12 724 -#define IMG_CUSTOM_12_EDITOR 725 -#define IMG_CUSTOM_13 726 -#define IMG_CUSTOM_13_EDITOR 727 -#define IMG_CUSTOM_14 728 -#define IMG_CUSTOM_14_EDITOR 729 -#define IMG_CUSTOM_15 730 -#define IMG_CUSTOM_15_EDITOR 731 -#define IMG_CUSTOM_16 732 -#define IMG_CUSTOM_16_EDITOR 733 -#define IMG_CUSTOM_17 734 -#define IMG_CUSTOM_17_EDITOR 735 -#define IMG_CUSTOM_18 736 -#define IMG_CUSTOM_18_EDITOR 737 -#define IMG_CUSTOM_19 738 -#define IMG_CUSTOM_19_EDITOR 739 -#define IMG_CUSTOM_20 740 -#define IMG_CUSTOM_20_EDITOR 741 -#define IMG_CUSTOM_21 742 -#define IMG_CUSTOM_21_EDITOR 743 -#define IMG_CUSTOM_22 744 -#define IMG_CUSTOM_22_EDITOR 745 -#define IMG_CUSTOM_23 746 -#define IMG_CUSTOM_23_EDITOR 747 -#define IMG_CUSTOM_24 748 -#define IMG_CUSTOM_24_EDITOR 749 -#define IMG_CUSTOM_25 750 -#define IMG_CUSTOM_25_EDITOR 751 -#define IMG_CUSTOM_26 752 -#define IMG_CUSTOM_26_EDITOR 753 -#define IMG_CUSTOM_27 754 -#define IMG_CUSTOM_27_EDITOR 755 -#define IMG_CUSTOM_28 756 -#define IMG_CUSTOM_28_EDITOR 757 -#define IMG_CUSTOM_29 758 -#define IMG_CUSTOM_29_EDITOR 759 -#define IMG_CUSTOM_30 760 -#define IMG_CUSTOM_30_EDITOR 761 -#define IMG_CUSTOM_31 762 -#define IMG_CUSTOM_31_EDITOR 763 -#define IMG_CUSTOM_32 764 -#define IMG_CUSTOM_32_EDITOR 765 -#define IMG_CUSTOM_33 766 -#define IMG_CUSTOM_33_EDITOR 767 -#define IMG_CUSTOM_34 768 -#define IMG_CUSTOM_34_EDITOR 769 -#define IMG_CUSTOM_35 770 -#define IMG_CUSTOM_35_EDITOR 771 -#define IMG_CUSTOM_36 772 -#define IMG_CUSTOM_36_EDITOR 773 -#define IMG_CUSTOM_37 774 -#define IMG_CUSTOM_37_EDITOR 775 -#define IMG_CUSTOM_38 776 -#define IMG_CUSTOM_38_EDITOR 777 -#define IMG_CUSTOM_39 778 -#define IMG_CUSTOM_39_EDITOR 779 -#define IMG_CUSTOM_40 780 -#define IMG_CUSTOM_40_EDITOR 781 -#define IMG_CUSTOM_41 782 -#define IMG_CUSTOM_41_EDITOR 783 -#define IMG_CUSTOM_42 784 -#define IMG_CUSTOM_42_EDITOR 785 -#define IMG_CUSTOM_43 786 -#define IMG_CUSTOM_43_EDITOR 787 -#define IMG_CUSTOM_44 788 -#define IMG_CUSTOM_44_EDITOR 789 -#define IMG_CUSTOM_45 790 -#define IMG_CUSTOM_45_EDITOR 791 -#define IMG_CUSTOM_46 792 -#define IMG_CUSTOM_46_EDITOR 793 -#define IMG_CUSTOM_47 794 -#define IMG_CUSTOM_47_EDITOR 795 -#define IMG_CUSTOM_48 796 -#define IMG_CUSTOM_48_EDITOR 797 -#define IMG_CUSTOM_49 798 -#define IMG_CUSTOM_49_EDITOR 799 -#define IMG_CUSTOM_50 800 -#define IMG_CUSTOM_50_EDITOR 801 -#define IMG_CUSTOM_51 802 -#define IMG_CUSTOM_51_EDITOR 803 -#define IMG_CUSTOM_52 804 -#define IMG_CUSTOM_52_EDITOR 805 -#define IMG_CUSTOM_53 806 -#define IMG_CUSTOM_53_EDITOR 807 -#define IMG_CUSTOM_54 808 -#define IMG_CUSTOM_54_EDITOR 809 -#define IMG_CUSTOM_55 810 -#define IMG_CUSTOM_55_EDITOR 811 -#define IMG_CUSTOM_56 812 -#define IMG_CUSTOM_56_EDITOR 813 -#define IMG_CUSTOM_57 814 -#define IMG_CUSTOM_57_EDITOR 815 -#define IMG_CUSTOM_58 816 -#define IMG_CUSTOM_58_EDITOR 817 -#define IMG_CUSTOM_59 818 -#define IMG_CUSTOM_59_EDITOR 819 -#define IMG_CUSTOM_60 820 -#define IMG_CUSTOM_60_EDITOR 821 -#define IMG_CUSTOM_61 822 -#define IMG_CUSTOM_61_EDITOR 823 -#define IMG_CUSTOM_62 824 -#define IMG_CUSTOM_62_EDITOR 825 -#define IMG_CUSTOM_63 826 -#define IMG_CUSTOM_63_EDITOR 827 -#define IMG_CUSTOM_64 828 -#define IMG_CUSTOM_64_EDITOR 829 -#define IMG_CUSTOM_65 830 -#define IMG_CUSTOM_65_EDITOR 831 -#define IMG_CUSTOM_66 832 -#define IMG_CUSTOM_66_EDITOR 833 -#define IMG_CUSTOM_67 834 -#define IMG_CUSTOM_67_EDITOR 835 -#define IMG_CUSTOM_68 836 -#define IMG_CUSTOM_68_EDITOR 837 -#define IMG_CUSTOM_69 838 -#define IMG_CUSTOM_69_EDITOR 839 -#define IMG_CUSTOM_70 840 -#define IMG_CUSTOM_70_EDITOR 841 -#define IMG_CUSTOM_71 842 -#define IMG_CUSTOM_71_EDITOR 843 -#define IMG_CUSTOM_72 844 -#define IMG_CUSTOM_72_EDITOR 845 -#define IMG_CUSTOM_73 846 -#define IMG_CUSTOM_73_EDITOR 847 -#define IMG_CUSTOM_74 848 -#define IMG_CUSTOM_74_EDITOR 849 -#define IMG_CUSTOM_75 850 -#define IMG_CUSTOM_75_EDITOR 851 -#define IMG_CUSTOM_76 852 -#define IMG_CUSTOM_76_EDITOR 853 -#define IMG_CUSTOM_77 854 -#define IMG_CUSTOM_77_EDITOR 855 -#define IMG_CUSTOM_78 856 -#define IMG_CUSTOM_78_EDITOR 857 -#define IMG_CUSTOM_79 858 -#define IMG_CUSTOM_79_EDITOR 859 -#define IMG_CUSTOM_80 860 -#define IMG_CUSTOM_80_EDITOR 861 -#define IMG_CUSTOM_81 862 -#define IMG_CUSTOM_81_EDITOR 863 -#define IMG_CUSTOM_82 864 -#define IMG_CUSTOM_82_EDITOR 865 -#define IMG_CUSTOM_83 866 -#define IMG_CUSTOM_83_EDITOR 867 -#define IMG_CUSTOM_84 868 -#define IMG_CUSTOM_84_EDITOR 869 -#define IMG_CUSTOM_85 870 -#define IMG_CUSTOM_85_EDITOR 871 -#define IMG_CUSTOM_86 872 -#define IMG_CUSTOM_86_EDITOR 873 -#define IMG_CUSTOM_87 874 -#define IMG_CUSTOM_87_EDITOR 875 -#define IMG_CUSTOM_88 876 -#define IMG_CUSTOM_88_EDITOR 877 -#define IMG_CUSTOM_89 878 -#define IMG_CUSTOM_89_EDITOR 879 -#define IMG_CUSTOM_90 880 -#define IMG_CUSTOM_90_EDITOR 881 -#define IMG_CUSTOM_91 882 -#define IMG_CUSTOM_91_EDITOR 883 -#define IMG_CUSTOM_92 884 -#define IMG_CUSTOM_92_EDITOR 885 -#define IMG_CUSTOM_93 886 -#define IMG_CUSTOM_93_EDITOR 887 -#define IMG_CUSTOM_94 888 -#define IMG_CUSTOM_94_EDITOR 889 -#define IMG_CUSTOM_95 890 -#define IMG_CUSTOM_95_EDITOR 891 -#define IMG_CUSTOM_96 892 -#define IMG_CUSTOM_96_EDITOR 893 -#define IMG_CUSTOM_97 894 -#define IMG_CUSTOM_97_EDITOR 895 -#define IMG_CUSTOM_98 896 -#define IMG_CUSTOM_98_EDITOR 897 -#define IMG_CUSTOM_99 898 -#define IMG_CUSTOM_99_EDITOR 899 -#define IMG_CUSTOM_100 900 -#define IMG_CUSTOM_100_EDITOR 901 -#define IMG_CUSTOM_101 902 -#define IMG_CUSTOM_101_EDITOR 903 -#define IMG_CUSTOM_102 904 -#define IMG_CUSTOM_102_EDITOR 905 -#define IMG_CUSTOM_103 906 -#define IMG_CUSTOM_103_EDITOR 907 -#define IMG_CUSTOM_104 908 -#define IMG_CUSTOM_104_EDITOR 909 -#define IMG_CUSTOM_105 910 -#define IMG_CUSTOM_105_EDITOR 911 -#define IMG_CUSTOM_106 912 -#define IMG_CUSTOM_106_EDITOR 913 -#define IMG_CUSTOM_107 914 -#define IMG_CUSTOM_107_EDITOR 915 -#define IMG_CUSTOM_108 916 -#define IMG_CUSTOM_108_EDITOR 917 -#define IMG_CUSTOM_109 918 -#define IMG_CUSTOM_109_EDITOR 919 -#define IMG_CUSTOM_110 920 -#define IMG_CUSTOM_110_EDITOR 921 -#define IMG_CUSTOM_111 922 -#define IMG_CUSTOM_111_EDITOR 923 -#define IMG_CUSTOM_112 924 -#define IMG_CUSTOM_112_EDITOR 925 -#define IMG_CUSTOM_113 926 -#define IMG_CUSTOM_113_EDITOR 927 -#define IMG_CUSTOM_114 928 -#define IMG_CUSTOM_114_EDITOR 929 -#define IMG_CUSTOM_115 930 -#define IMG_CUSTOM_115_EDITOR 931 -#define IMG_CUSTOM_116 932 -#define IMG_CUSTOM_116_EDITOR 933 -#define IMG_CUSTOM_117 934 -#define IMG_CUSTOM_117_EDITOR 935 -#define IMG_CUSTOM_118 936 -#define IMG_CUSTOM_118_EDITOR 937 -#define IMG_CUSTOM_119 938 -#define IMG_CUSTOM_119_EDITOR 939 -#define IMG_CUSTOM_120 940 -#define IMG_CUSTOM_120_EDITOR 941 -#define IMG_CUSTOM_121 942 -#define IMG_CUSTOM_121_EDITOR 943 -#define IMG_CUSTOM_122 944 -#define IMG_CUSTOM_122_EDITOR 945 -#define IMG_CUSTOM_123 946 -#define IMG_CUSTOM_123_EDITOR 947 -#define IMG_CUSTOM_124 948 -#define IMG_CUSTOM_124_EDITOR 949 -#define IMG_CUSTOM_125 950 -#define IMG_CUSTOM_125_EDITOR 951 -#define IMG_CUSTOM_126 952 -#define IMG_CUSTOM_126_EDITOR 953 -#define IMG_CUSTOM_127 954 -#define IMG_CUSTOM_127_EDITOR 955 -#define IMG_CUSTOM_128 956 -#define IMG_CUSTOM_128_EDITOR 957 -#define IMG_CUSTOM_129 958 -#define IMG_CUSTOM_129_EDITOR 959 -#define IMG_CUSTOM_130 960 -#define IMG_CUSTOM_130_EDITOR 961 -#define IMG_CUSTOM_131 962 -#define IMG_CUSTOM_131_EDITOR 963 -#define IMG_CUSTOM_132 964 -#define IMG_CUSTOM_132_EDITOR 965 -#define IMG_CUSTOM_133 966 -#define IMG_CUSTOM_133_EDITOR 967 -#define IMG_CUSTOM_134 968 -#define IMG_CUSTOM_134_EDITOR 969 -#define IMG_CUSTOM_135 970 -#define IMG_CUSTOM_135_EDITOR 971 -#define IMG_CUSTOM_136 972 -#define IMG_CUSTOM_136_EDITOR 973 -#define IMG_CUSTOM_137 974 -#define IMG_CUSTOM_137_EDITOR 975 -#define IMG_CUSTOM_138 976 -#define IMG_CUSTOM_138_EDITOR 977 -#define IMG_CUSTOM_139 978 -#define IMG_CUSTOM_139_EDITOR 979 -#define IMG_CUSTOM_140 980 -#define IMG_CUSTOM_140_EDITOR 981 -#define IMG_CUSTOM_141 982 -#define IMG_CUSTOM_141_EDITOR 983 -#define IMG_CUSTOM_142 984 -#define IMG_CUSTOM_142_EDITOR 985 -#define IMG_CUSTOM_143 986 -#define IMG_CUSTOM_143_EDITOR 987 -#define IMG_CUSTOM_144 988 -#define IMG_CUSTOM_144_EDITOR 989 -#define IMG_CUSTOM_145 990 -#define IMG_CUSTOM_145_EDITOR 991 -#define IMG_CUSTOM_146 992 -#define IMG_CUSTOM_146_EDITOR 993 -#define IMG_CUSTOM_147 994 -#define IMG_CUSTOM_147_EDITOR 995 -#define IMG_CUSTOM_148 996 -#define IMG_CUSTOM_148_EDITOR 997 -#define IMG_CUSTOM_149 998 -#define IMG_CUSTOM_149_EDITOR 999 -#define IMG_CUSTOM_150 1000 -#define IMG_CUSTOM_150_EDITOR 1001 -#define IMG_CUSTOM_151 1002 -#define IMG_CUSTOM_151_EDITOR 1003 -#define IMG_CUSTOM_152 1004 -#define IMG_CUSTOM_152_EDITOR 1005 -#define IMG_CUSTOM_153 1006 -#define IMG_CUSTOM_153_EDITOR 1007 -#define IMG_CUSTOM_154 1008 -#define IMG_CUSTOM_154_EDITOR 1009 -#define IMG_CUSTOM_155 1010 -#define IMG_CUSTOM_155_EDITOR 1011 -#define IMG_CUSTOM_156 1012 -#define IMG_CUSTOM_156_EDITOR 1013 -#define IMG_CUSTOM_157 1014 -#define IMG_CUSTOM_157_EDITOR 1015 -#define IMG_CUSTOM_158 1016 -#define IMG_CUSTOM_158_EDITOR 1017 -#define IMG_CUSTOM_159 1018 -#define IMG_CUSTOM_159_EDITOR 1019 -#define IMG_CUSTOM_160 1020 -#define IMG_CUSTOM_160_EDITOR 1021 -#define IMG_CUSTOM_161 1022 -#define IMG_CUSTOM_161_EDITOR 1023 -#define IMG_CUSTOM_162 1024 -#define IMG_CUSTOM_162_EDITOR 1025 -#define IMG_CUSTOM_163 1026 -#define IMG_CUSTOM_163_EDITOR 1027 -#define IMG_CUSTOM_164 1028 -#define IMG_CUSTOM_164_EDITOR 1029 -#define IMG_CUSTOM_165 1030 -#define IMG_CUSTOM_165_EDITOR 1031 -#define IMG_CUSTOM_166 1032 -#define IMG_CUSTOM_166_EDITOR 1033 -#define IMG_CUSTOM_167 1034 -#define IMG_CUSTOM_167_EDITOR 1035 -#define IMG_CUSTOM_168 1036 -#define IMG_CUSTOM_168_EDITOR 1037 -#define IMG_CUSTOM_169 1038 -#define IMG_CUSTOM_169_EDITOR 1039 -#define IMG_CUSTOM_170 1040 -#define IMG_CUSTOM_170_EDITOR 1041 -#define IMG_CUSTOM_171 1042 -#define IMG_CUSTOM_171_EDITOR 1043 -#define IMG_CUSTOM_172 1044 -#define IMG_CUSTOM_172_EDITOR 1045 -#define IMG_CUSTOM_173 1046 -#define IMG_CUSTOM_173_EDITOR 1047 -#define IMG_CUSTOM_174 1048 -#define IMG_CUSTOM_174_EDITOR 1049 -#define IMG_CUSTOM_175 1050 -#define IMG_CUSTOM_175_EDITOR 1051 -#define IMG_CUSTOM_176 1052 -#define IMG_CUSTOM_176_EDITOR 1053 -#define IMG_CUSTOM_177 1054 -#define IMG_CUSTOM_177_EDITOR 1055 -#define IMG_CUSTOM_178 1056 -#define IMG_CUSTOM_178_EDITOR 1057 -#define IMG_CUSTOM_179 1058 -#define IMG_CUSTOM_179_EDITOR 1059 -#define IMG_CUSTOM_180 1060 -#define IMG_CUSTOM_180_EDITOR 1061 -#define IMG_CUSTOM_181 1062 -#define IMG_CUSTOM_181_EDITOR 1063 -#define IMG_CUSTOM_182 1064 -#define IMG_CUSTOM_182_EDITOR 1065 -#define IMG_CUSTOM_183 1066 -#define IMG_CUSTOM_183_EDITOR 1067 -#define IMG_CUSTOM_184 1068 -#define IMG_CUSTOM_184_EDITOR 1069 -#define IMG_CUSTOM_185 1070 -#define IMG_CUSTOM_185_EDITOR 1071 -#define IMG_CUSTOM_186 1072 -#define IMG_CUSTOM_186_EDITOR 1073 -#define IMG_CUSTOM_187 1074 -#define IMG_CUSTOM_187_EDITOR 1075 -#define IMG_CUSTOM_188 1076 -#define IMG_CUSTOM_188_EDITOR 1077 -#define IMG_CUSTOM_189 1078 -#define IMG_CUSTOM_189_EDITOR 1079 -#define IMG_CUSTOM_190 1080 -#define IMG_CUSTOM_190_EDITOR 1081 -#define IMG_CUSTOM_191 1082 -#define IMG_CUSTOM_191_EDITOR 1083 -#define IMG_CUSTOM_192 1084 -#define IMG_CUSTOM_192_EDITOR 1085 -#define IMG_CUSTOM_193 1086 -#define IMG_CUSTOM_193_EDITOR 1087 -#define IMG_CUSTOM_194 1088 -#define IMG_CUSTOM_194_EDITOR 1089 -#define IMG_CUSTOM_195 1090 -#define IMG_CUSTOM_195_EDITOR 1091 -#define IMG_CUSTOM_196 1092 -#define IMG_CUSTOM_196_EDITOR 1093 -#define IMG_CUSTOM_197 1094 -#define IMG_CUSTOM_197_EDITOR 1095 -#define IMG_CUSTOM_198 1096 -#define IMG_CUSTOM_198_EDITOR 1097 -#define IMG_CUSTOM_199 1098 -#define IMG_CUSTOM_199_EDITOR 1099 -#define IMG_CUSTOM_200 1100 -#define IMG_CUSTOM_200_EDITOR 1101 -#define IMG_CUSTOM_201 1102 -#define IMG_CUSTOM_201_EDITOR 1103 -#define IMG_CUSTOM_202 1104 -#define IMG_CUSTOM_202_EDITOR 1105 -#define IMG_CUSTOM_203 1106 -#define IMG_CUSTOM_203_EDITOR 1107 -#define IMG_CUSTOM_204 1108 -#define IMG_CUSTOM_204_EDITOR 1109 -#define IMG_CUSTOM_205 1110 -#define IMG_CUSTOM_205_EDITOR 1111 -#define IMG_CUSTOM_206 1112 -#define IMG_CUSTOM_206_EDITOR 1113 -#define IMG_CUSTOM_207 1114 -#define IMG_CUSTOM_207_EDITOR 1115 -#define IMG_CUSTOM_208 1116 -#define IMG_CUSTOM_208_EDITOR 1117 -#define IMG_CUSTOM_209 1118 -#define IMG_CUSTOM_209_EDITOR 1119 -#define IMG_CUSTOM_210 1120 -#define IMG_CUSTOM_210_EDITOR 1121 -#define IMG_CUSTOM_211 1122 -#define IMG_CUSTOM_211_EDITOR 1123 -#define IMG_CUSTOM_212 1124 -#define IMG_CUSTOM_212_EDITOR 1125 -#define IMG_CUSTOM_213 1126 -#define IMG_CUSTOM_213_EDITOR 1127 -#define IMG_CUSTOM_214 1128 -#define IMG_CUSTOM_214_EDITOR 1129 -#define IMG_CUSTOM_215 1130 -#define IMG_CUSTOM_215_EDITOR 1131 -#define IMG_CUSTOM_216 1132 -#define IMG_CUSTOM_216_EDITOR 1133 -#define IMG_CUSTOM_217 1134 -#define IMG_CUSTOM_217_EDITOR 1135 -#define IMG_CUSTOM_218 1136 -#define IMG_CUSTOM_218_EDITOR 1137 -#define IMG_CUSTOM_219 1138 -#define IMG_CUSTOM_219_EDITOR 1139 -#define IMG_CUSTOM_220 1140 -#define IMG_CUSTOM_220_EDITOR 1141 -#define IMG_CUSTOM_221 1142 -#define IMG_CUSTOM_221_EDITOR 1143 -#define IMG_CUSTOM_222 1144 -#define IMG_CUSTOM_222_EDITOR 1145 -#define IMG_CUSTOM_223 1146 -#define IMG_CUSTOM_223_EDITOR 1147 -#define IMG_CUSTOM_224 1148 -#define IMG_CUSTOM_224_EDITOR 1149 -#define IMG_CUSTOM_225 1150 -#define IMG_CUSTOM_225_EDITOR 1151 -#define IMG_CUSTOM_226 1152 -#define IMG_CUSTOM_226_EDITOR 1153 -#define IMG_CUSTOM_227 1154 -#define IMG_CUSTOM_227_EDITOR 1155 -#define IMG_CUSTOM_228 1156 -#define IMG_CUSTOM_228_EDITOR 1157 -#define IMG_CUSTOM_229 1158 -#define IMG_CUSTOM_229_EDITOR 1159 -#define IMG_CUSTOM_230 1160 -#define IMG_CUSTOM_230_EDITOR 1161 -#define IMG_CUSTOM_231 1162 -#define IMG_CUSTOM_231_EDITOR 1163 -#define IMG_CUSTOM_232 1164 -#define IMG_CUSTOM_232_EDITOR 1165 -#define IMG_CUSTOM_233 1166 -#define IMG_CUSTOM_233_EDITOR 1167 -#define IMG_CUSTOM_234 1168 -#define IMG_CUSTOM_234_EDITOR 1169 -#define IMG_CUSTOM_235 1170 -#define IMG_CUSTOM_235_EDITOR 1171 -#define IMG_CUSTOM_236 1172 -#define IMG_CUSTOM_236_EDITOR 1173 -#define IMG_CUSTOM_237 1174 -#define IMG_CUSTOM_237_EDITOR 1175 -#define IMG_CUSTOM_238 1176 -#define IMG_CUSTOM_238_EDITOR 1177 -#define IMG_CUSTOM_239 1178 -#define IMG_CUSTOM_239_EDITOR 1179 -#define IMG_CUSTOM_240 1180 -#define IMG_CUSTOM_240_EDITOR 1181 -#define IMG_CUSTOM_241 1182 -#define IMG_CUSTOM_241_EDITOR 1183 -#define IMG_CUSTOM_242 1184 -#define IMG_CUSTOM_242_EDITOR 1185 -#define IMG_CUSTOM_243 1186 -#define IMG_CUSTOM_243_EDITOR 1187 -#define IMG_CUSTOM_244 1188 -#define IMG_CUSTOM_244_EDITOR 1189 -#define IMG_CUSTOM_245 1190 -#define IMG_CUSTOM_245_EDITOR 1191 -#define IMG_CUSTOM_246 1192 -#define IMG_CUSTOM_246_EDITOR 1193 -#define IMG_CUSTOM_247 1194 -#define IMG_CUSTOM_247_EDITOR 1195 -#define IMG_CUSTOM_248 1196 -#define IMG_CUSTOM_248_EDITOR 1197 -#define IMG_CUSTOM_249 1198 -#define IMG_CUSTOM_249_EDITOR 1199 -#define IMG_CUSTOM_250 1200 -#define IMG_CUSTOM_250_EDITOR 1201 -#define IMG_CUSTOM_251 1202 -#define IMG_CUSTOM_251_EDITOR 1203 -#define IMG_CUSTOM_252 1204 -#define IMG_CUSTOM_252_EDITOR 1205 -#define IMG_CUSTOM_253 1206 -#define IMG_CUSTOM_253_EDITOR 1207 -#define IMG_CUSTOM_254 1208 -#define IMG_CUSTOM_254_EDITOR 1209 -#define IMG_CUSTOM_255 1210 -#define IMG_CUSTOM_255_EDITOR 1211 -#define IMG_CUSTOM_256 1212 -#define IMG_CUSTOM_256_EDITOR 1213 -#define IMG_TOON_1 1214 -#define IMG_TOON_2 1215 -#define IMG_TOON_3 1216 -#define IMG_TOON_4 1217 -#define IMG_TOON_5 1218 -#define IMG_TOON_6 1219 -#define IMG_TOON_7 1220 -#define IMG_TOON_8 1221 -#define IMG_TOON_9 1222 -#define IMG_TOON_10 1223 -#define IMG_TOON_11 1224 -#define IMG_TOON_12 1225 -#define IMG_TOON_13 1226 -#define IMG_TOON_14 1227 -#define IMG_TOON_15 1228 -#define IMG_TOON_16 1229 -#define IMG_TOON_17 1230 -#define IMG_TOON_18 1231 -#define IMG_TOON_19 1232 -#define IMG_TOON_20 1233 -#define IMG_MENU_CALIBRATE_RED 1234 -#define IMG_MENU_CALIBRATE_BLUE 1235 -#define IMG_MENU_CALIBRATE_YELLOW 1236 -#define IMG_MENU_BUTTON 1237 -#define IMG_MENU_BUTTON_ACTIVE 1238 -#define IMG_MENU_BUTTON_LEFT 1239 -#define IMG_MENU_BUTTON_RIGHT 1240 -#define IMG_MENU_BUTTON_UP 1241 -#define IMG_MENU_BUTTON_DOWN 1242 -#define IMG_MENU_BUTTON_LEFT_ACTIVE 1243 -#define IMG_MENU_BUTTON_RIGHT_ACTIVE 1244 -#define IMG_MENU_BUTTON_UP_ACTIVE 1245 -#define IMG_MENU_BUTTON_DOWN_ACTIVE 1246 -#define IMG_MENU_SCROLLBAR 1247 -#define IMG_MENU_SCROLLBAR_ACTIVE 1248 -#define IMG_FONT_INITIAL_1 1249 -#define IMG_FONT_INITIAL_2 1250 -#define IMG_FONT_INITIAL_3 1251 -#define IMG_FONT_INITIAL_4 1252 -#define IMG_FONT_TITLE_1 1253 -#define IMG_FONT_TITLE_1_LEVELS 1254 -#define IMG_FONT_TITLE_2 1255 -#define IMG_FONT_MENU_1 1256 -#define IMG_FONT_MENU_2 1257 -#define IMG_FONT_TEXT_1 1258 -#define IMG_FONT_TEXT_1_LEVELS 1259 -#define IMG_FONT_TEXT_1_PREVIEW 1260 -#define IMG_FONT_TEXT_1_SCORES 1261 -#define IMG_FONT_TEXT_1_ACTIVE_SCORES 1262 -#define IMG_FONT_TEXT_2 1263 -#define IMG_FONT_TEXT_2_LEVELS 1264 -#define IMG_FONT_TEXT_2_PREVIEW 1265 -#define IMG_FONT_TEXT_2_SCORES 1266 -#define IMG_FONT_TEXT_2_ACTIVE_SCORES 1267 -#define IMG_FONT_TEXT_3 1268 -#define IMG_FONT_TEXT_3_LEVELS 1269 -#define IMG_FONT_TEXT_3_PREVIEW 1270 -#define IMG_FONT_TEXT_3_SCORES 1271 -#define IMG_FONT_TEXT_3_ACTIVE_SCORES 1272 -#define IMG_FONT_TEXT_4 1273 -#define IMG_FONT_TEXT_4_LEVELS 1274 -#define IMG_FONT_TEXT_4_SCORES 1275 -#define IMG_FONT_TEXT_4_ACTIVE_SCORES 1276 -#define IMG_FONT_ENVELOPE_1 1277 -#define IMG_FONT_ENVELOPE_2 1278 -#define IMG_FONT_ENVELOPE_3 1279 -#define IMG_FONT_ENVELOPE_4 1280 -#define IMG_FONT_INPUT_1 1281 -#define IMG_FONT_INPUT_1_MAIN 1282 -#define IMG_FONT_INPUT_1_ACTIVE 1283 -#define IMG_FONT_INPUT_1_ACTIVE_MAIN 1284 -#define IMG_FONT_INPUT_1_ACTIVE_SETUP 1285 -#define IMG_FONT_INPUT_2 1286 -#define IMG_FONT_INPUT_2_ACTIVE 1287 -#define IMG_FONT_OPTION_OFF 1288 -#define IMG_FONT_OPTION_ON 1289 -#define IMG_FONT_VALUE_1 1290 -#define IMG_FONT_VALUE_2 1291 -#define IMG_FONT_VALUE_OLD 1292 -#define IMG_FONT_LEVEL_NUMBER 1293 -#define IMG_FONT_TAPE_RECORDER 1294 -#define IMG_FONT_GAME_INFO 1295 -#define IMG_GLOBAL_BORDER 1296 -#define IMG_GLOBAL_DOOR 1297 -#define IMG_EDITOR_ELEMENT_BORDER 1298 -#define IMG_EDITOR_ELEMENT_BORDER_INPUT 1299 -#define IMG_BACKGROUND_ENVELOPE_1 1300 -#define IMG_BACKGROUND_ENVELOPE_2 1301 -#define IMG_BACKGROUND_ENVELOPE_3 1302 -#define IMG_BACKGROUND_ENVELOPE_4 1303 -#define IMG_BACKGROUND 1304 -#define IMG_BACKGROUND_MAIN 1305 -#define IMG_BACKGROUND_LEVELS 1306 -#define IMG_BACKGROUND_SCORES 1307 -#define IMG_BACKGROUND_EDITOR 1308 -#define IMG_BACKGROUND_INFO 1309 -#define IMG_BACKGROUND_SETUP 1310 -#define IMG_BACKGROUND_DOOR 1311 +#define IMG_MAZE_RUNNER 496 +#define IMG_PLAYER_1 497 +#define IMG_PLAYER_1_EDITOR 498 +#define IMG_PLAYER_1_DOWN 499 +#define IMG_PLAYER_1_UP 500 +#define IMG_PLAYER_1_LEFT 501 +#define IMG_PLAYER_1_RIGHT 502 +#define IMG_PLAYER_1_MOVING_DOWN 503 +#define IMG_PLAYER_1_MOVING_UP 504 +#define IMG_PLAYER_1_MOVING_LEFT 505 +#define IMG_PLAYER_1_MOVING_RIGHT 506 +#define IMG_PLAYER_1_DIGGING_DOWN 507 +#define IMG_PLAYER_1_DIGGING_UP 508 +#define IMG_PLAYER_1_DIGGING_LEFT 509 +#define IMG_PLAYER_1_DIGGING_RIGHT 510 +#define IMG_PLAYER_1_COLLECTING_DOWN 511 +#define IMG_PLAYER_1_COLLECTING_UP 512 +#define IMG_PLAYER_1_COLLECTING_LEFT 513 +#define IMG_PLAYER_1_COLLECTING_RIGHT 514 +#define IMG_PLAYER_1_PUSHING_DOWN 515 +#define IMG_PLAYER_1_PUSHING_UP 516 +#define IMG_PLAYER_1_PUSHING_LEFT 517 +#define IMG_PLAYER_1_PUSHING_RIGHT 518 +#define IMG_PLAYER_1_SNAPPING_DOWN 519 +#define IMG_PLAYER_1_SNAPPING_UP 520 +#define IMG_PLAYER_1_SNAPPING_LEFT 521 +#define IMG_PLAYER_1_SNAPPING_RIGHT 522 +#define IMG_PLAYER_2 523 +#define IMG_PLAYER_2_EDITOR 524 +#define IMG_PLAYER_2_DOWN 525 +#define IMG_PLAYER_2_UP 526 +#define IMG_PLAYER_2_LEFT 527 +#define IMG_PLAYER_2_RIGHT 528 +#define IMG_PLAYER_2_MOVING_DOWN 529 +#define IMG_PLAYER_2_MOVING_UP 530 +#define IMG_PLAYER_2_MOVING_LEFT 531 +#define IMG_PLAYER_2_MOVING_RIGHT 532 +#define IMG_PLAYER_2_DIGGING_DOWN 533 +#define IMG_PLAYER_2_DIGGING_UP 534 +#define IMG_PLAYER_2_DIGGING_LEFT 535 +#define IMG_PLAYER_2_DIGGING_RIGHT 536 +#define IMG_PLAYER_2_COLLECTING_DOWN 537 +#define IMG_PLAYER_2_COLLECTING_UP 538 +#define IMG_PLAYER_2_COLLECTING_LEFT 539 +#define IMG_PLAYER_2_COLLECTING_RIGHT 540 +#define IMG_PLAYER_2_PUSHING_DOWN 541 +#define IMG_PLAYER_2_PUSHING_UP 542 +#define IMG_PLAYER_2_PUSHING_LEFT 543 +#define IMG_PLAYER_2_PUSHING_RIGHT 544 +#define IMG_PLAYER_2_SNAPPING_DOWN 545 +#define IMG_PLAYER_2_SNAPPING_UP 546 +#define IMG_PLAYER_2_SNAPPING_LEFT 547 +#define IMG_PLAYER_2_SNAPPING_RIGHT 548 +#define IMG_PLAYER_3 549 +#define IMG_PLAYER_3_EDITOR 550 +#define IMG_PLAYER_3_DOWN 551 +#define IMG_PLAYER_3_UP 552 +#define IMG_PLAYER_3_LEFT 553 +#define IMG_PLAYER_3_RIGHT 554 +#define IMG_PLAYER_3_MOVING_DOWN 555 +#define IMG_PLAYER_3_MOVING_UP 556 +#define IMG_PLAYER_3_MOVING_LEFT 557 +#define IMG_PLAYER_3_MOVING_RIGHT 558 +#define IMG_PLAYER_3_DIGGING_DOWN 559 +#define IMG_PLAYER_3_DIGGING_UP 560 +#define IMG_PLAYER_3_DIGGING_LEFT 561 +#define IMG_PLAYER_3_DIGGING_RIGHT 562 +#define IMG_PLAYER_3_COLLECTING_DOWN 563 +#define IMG_PLAYER_3_COLLECTING_UP 564 +#define IMG_PLAYER_3_COLLECTING_LEFT 565 +#define IMG_PLAYER_3_COLLECTING_RIGHT 566 +#define IMG_PLAYER_3_PUSHING_DOWN 567 +#define IMG_PLAYER_3_PUSHING_UP 568 +#define IMG_PLAYER_3_PUSHING_LEFT 569 +#define IMG_PLAYER_3_PUSHING_RIGHT 570 +#define IMG_PLAYER_3_SNAPPING_DOWN 571 +#define IMG_PLAYER_3_SNAPPING_UP 572 +#define IMG_PLAYER_3_SNAPPING_LEFT 573 +#define IMG_PLAYER_3_SNAPPING_RIGHT 574 +#define IMG_PLAYER_4 575 +#define IMG_PLAYER_4_EDITOR 576 +#define IMG_PLAYER_4_DOWN 577 +#define IMG_PLAYER_4_UP 578 +#define IMG_PLAYER_4_LEFT 579 +#define IMG_PLAYER_4_RIGHT 580 +#define IMG_PLAYER_4_MOVING_DOWN 581 +#define IMG_PLAYER_4_MOVING_UP 582 +#define IMG_PLAYER_4_MOVING_LEFT 583 +#define IMG_PLAYER_4_MOVING_RIGHT 584 +#define IMG_PLAYER_4_DIGGING_DOWN 585 +#define IMG_PLAYER_4_DIGGING_UP 586 +#define IMG_PLAYER_4_DIGGING_LEFT 587 +#define IMG_PLAYER_4_DIGGING_RIGHT 588 +#define IMG_PLAYER_4_COLLECTING_DOWN 589 +#define IMG_PLAYER_4_COLLECTING_UP 590 +#define IMG_PLAYER_4_COLLECTING_LEFT 591 +#define IMG_PLAYER_4_COLLECTING_RIGHT 592 +#define IMG_PLAYER_4_PUSHING_DOWN 593 +#define IMG_PLAYER_4_PUSHING_UP 594 +#define IMG_PLAYER_4_PUSHING_LEFT 595 +#define IMG_PLAYER_4_PUSHING_RIGHT 596 +#define IMG_PLAYER_4_SNAPPING_DOWN 597 +#define IMG_PLAYER_4_SNAPPING_UP 598 +#define IMG_PLAYER_4_SNAPPING_LEFT 599 +#define IMG_PLAYER_4_SNAPPING_RIGHT 600 +#define IMG_DEFAULT_EXPLODING 601 +#define IMG_TWINKLE_BLUE 602 +#define IMG_TWINKLE_WHITE 603 +#define IMG_STEELWALL_TOPLEFT 604 +#define IMG_STEELWALL_TOPRIGHT 605 +#define IMG_STEELWALL_BOTTOMLEFT 606 +#define IMG_STEELWALL_BOTTOMRIGHT 607 +#define IMG_STEELWALL_HORIZONTAL 608 +#define IMG_STEELWALL_VERTICAL 609 +#define IMG_STEELWALL_TOPLEFT_EDITOR 610 +#define IMG_STEELWALL_TOPRIGHT_EDITOR 611 +#define IMG_STEELWALL_BOTTOMLEFT_EDITOR 612 +#define IMG_STEELWALL_BOTTOMRIGHT_EDITOR 613 +#define IMG_STEELWALL_HORIZONTAL_EDITOR 614 +#define IMG_STEELWALL_VERTICAL_EDITOR 615 +#define IMG_INVISIBLE_STEELWALL_TOPLEFT 616 +#define IMG_INVISIBLE_STEELWALL_TOPRIGHT 617 +#define IMG_INVISIBLE_STEELWALL_BOTTOMLEFT 618 +#define IMG_INVISIBLE_STEELWALL_BOTTOMRIGHT 619 +#define IMG_INVISIBLE_STEELWALL_HORIZONTAL 620 +#define IMG_INVISIBLE_STEELWALL_VERTICAL 621 +#define IMG_INVISIBLE_STEELWALL_TOPLEFT_EDITOR 622 +#define IMG_INVISIBLE_STEELWALL_TOPRIGHT_EDITOR 623 +#define IMG_INVISIBLE_STEELWALL_BOTTOMLEFT_EDITOR 624 +#define IMG_INVISIBLE_STEELWALL_BOTTOMRIGHT_EDITOR 625 +#define IMG_INVISIBLE_STEELWALL_HORIZONTAL_EDITOR 626 +#define IMG_INVISIBLE_STEELWALL_VERTICAL_EDITOR 627 +#define IMG_ARROW_LEFT 628 +#define IMG_ARROW_RIGHT 629 +#define IMG_ARROW_UP 630 +#define IMG_ARROW_DOWN 631 +#define IMG_CHAR_SPACE 632 +#define IMG_CHAR_EXCLAM 633 +#define IMG_CHAR_QUOTEDBL 634 +#define IMG_CHAR_NUMBERSIGN 635 +#define IMG_CHAR_DOLLAR 636 +#define IMG_CHAR_PROCENT 637 +#define IMG_CHAR_AMPERSAND 638 +#define IMG_CHAR_APOSTROPHE 639 +#define IMG_CHAR_PARENLEFT 640 +#define IMG_CHAR_PARENRIGHT 641 +#define IMG_CHAR_ASTERISK 642 +#define IMG_CHAR_PLUS 643 +#define IMG_CHAR_COMMA 644 +#define IMG_CHAR_MINUS 645 +#define IMG_CHAR_PERIOD 646 +#define IMG_CHAR_SLASH 647 +#define IMG_CHAR_0 648 +#define IMG_CHAR_1 649 +#define IMG_CHAR_2 650 +#define IMG_CHAR_3 651 +#define IMG_CHAR_4 652 +#define IMG_CHAR_5 653 +#define IMG_CHAR_6 654 +#define IMG_CHAR_7 655 +#define IMG_CHAR_8 656 +#define IMG_CHAR_9 657 +#define IMG_CHAR_COLON 658 +#define IMG_CHAR_SEMICOLON 659 +#define IMG_CHAR_LESS 660 +#define IMG_CHAR_EQUAL 661 +#define IMG_CHAR_GREATER 662 +#define IMG_CHAR_QUESTION 663 +#define IMG_CHAR_AT 664 +#define IMG_CHAR_A 665 +#define IMG_CHAR_B 666 +#define IMG_CHAR_C 667 +#define IMG_CHAR_D 668 +#define IMG_CHAR_E 669 +#define IMG_CHAR_F 670 +#define IMG_CHAR_G 671 +#define IMG_CHAR_H 672 +#define IMG_CHAR_I 673 +#define IMG_CHAR_J 674 +#define IMG_CHAR_K 675 +#define IMG_CHAR_L 676 +#define IMG_CHAR_M 677 +#define IMG_CHAR_N 678 +#define IMG_CHAR_O 679 +#define IMG_CHAR_P 680 +#define IMG_CHAR_Q 681 +#define IMG_CHAR_R 682 +#define IMG_CHAR_S 683 +#define IMG_CHAR_T 684 +#define IMG_CHAR_U 685 +#define IMG_CHAR_V 686 +#define IMG_CHAR_W 687 +#define IMG_CHAR_X 688 +#define IMG_CHAR_Y 689 +#define IMG_CHAR_Z 690 +#define IMG_CHAR_BRACKETLEFT 691 +#define IMG_CHAR_BACKSLASH 692 +#define IMG_CHAR_BRACKETRIGHT 693 +#define IMG_CHAR_ASCIICIRCUM 694 +#define IMG_CHAR_UNDERSCORE 695 +#define IMG_CHAR_COPYRIGHT 696 +#define IMG_CHAR_AUMLAUT 697 +#define IMG_CHAR_OUMLAUT 698 +#define IMG_CHAR_UUMLAUT 699 +#define IMG_CHAR_DEGREE 700 +#define IMG_CHAR_TRADEMARK 701 +#define IMG_CHAR_CURSOR 702 +#define IMG_CUSTOM_1 703 +#define IMG_CUSTOM_1_EDITOR 704 +#define IMG_CUSTOM_2 705 +#define IMG_CUSTOM_2_EDITOR 706 +#define IMG_CUSTOM_3 707 +#define IMG_CUSTOM_3_EDITOR 708 +#define IMG_CUSTOM_4 709 +#define IMG_CUSTOM_4_EDITOR 710 +#define IMG_CUSTOM_5 711 +#define IMG_CUSTOM_5_EDITOR 712 +#define IMG_CUSTOM_6 713 +#define IMG_CUSTOM_6_EDITOR 714 +#define IMG_CUSTOM_7 715 +#define IMG_CUSTOM_7_EDITOR 716 +#define IMG_CUSTOM_8 717 +#define IMG_CUSTOM_8_EDITOR 718 +#define IMG_CUSTOM_9 719 +#define IMG_CUSTOM_9_EDITOR 720 +#define IMG_CUSTOM_10 721 +#define IMG_CUSTOM_10_EDITOR 722 +#define IMG_CUSTOM_11 723 +#define IMG_CUSTOM_11_EDITOR 724 +#define IMG_CUSTOM_12 725 +#define IMG_CUSTOM_12_EDITOR 726 +#define IMG_CUSTOM_13 727 +#define IMG_CUSTOM_13_EDITOR 728 +#define IMG_CUSTOM_14 729 +#define IMG_CUSTOM_14_EDITOR 730 +#define IMG_CUSTOM_15 731 +#define IMG_CUSTOM_15_EDITOR 732 +#define IMG_CUSTOM_16 733 +#define IMG_CUSTOM_16_EDITOR 734 +#define IMG_CUSTOM_17 735 +#define IMG_CUSTOM_17_EDITOR 736 +#define IMG_CUSTOM_18 737 +#define IMG_CUSTOM_18_EDITOR 738 +#define IMG_CUSTOM_19 739 +#define IMG_CUSTOM_19_EDITOR 740 +#define IMG_CUSTOM_20 741 +#define IMG_CUSTOM_20_EDITOR 742 +#define IMG_CUSTOM_21 743 +#define IMG_CUSTOM_21_EDITOR 744 +#define IMG_CUSTOM_22 745 +#define IMG_CUSTOM_22_EDITOR 746 +#define IMG_CUSTOM_23 747 +#define IMG_CUSTOM_23_EDITOR 748 +#define IMG_CUSTOM_24 749 +#define IMG_CUSTOM_24_EDITOR 750 +#define IMG_CUSTOM_25 751 +#define IMG_CUSTOM_25_EDITOR 752 +#define IMG_CUSTOM_26 753 +#define IMG_CUSTOM_26_EDITOR 754 +#define IMG_CUSTOM_27 755 +#define IMG_CUSTOM_27_EDITOR 756 +#define IMG_CUSTOM_28 757 +#define IMG_CUSTOM_28_EDITOR 758 +#define IMG_CUSTOM_29 759 +#define IMG_CUSTOM_29_EDITOR 760 +#define IMG_CUSTOM_30 761 +#define IMG_CUSTOM_30_EDITOR 762 +#define IMG_CUSTOM_31 763 +#define IMG_CUSTOM_31_EDITOR 764 +#define IMG_CUSTOM_32 765 +#define IMG_CUSTOM_32_EDITOR 766 +#define IMG_CUSTOM_33 767 +#define IMG_CUSTOM_33_EDITOR 768 +#define IMG_CUSTOM_34 769 +#define IMG_CUSTOM_34_EDITOR 770 +#define IMG_CUSTOM_35 771 +#define IMG_CUSTOM_35_EDITOR 772 +#define IMG_CUSTOM_36 773 +#define IMG_CUSTOM_36_EDITOR 774 +#define IMG_CUSTOM_37 775 +#define IMG_CUSTOM_37_EDITOR 776 +#define IMG_CUSTOM_38 777 +#define IMG_CUSTOM_38_EDITOR 778 +#define IMG_CUSTOM_39 779 +#define IMG_CUSTOM_39_EDITOR 780 +#define IMG_CUSTOM_40 781 +#define IMG_CUSTOM_40_EDITOR 782 +#define IMG_CUSTOM_41 783 +#define IMG_CUSTOM_41_EDITOR 784 +#define IMG_CUSTOM_42 785 +#define IMG_CUSTOM_42_EDITOR 786 +#define IMG_CUSTOM_43 787 +#define IMG_CUSTOM_43_EDITOR 788 +#define IMG_CUSTOM_44 789 +#define IMG_CUSTOM_44_EDITOR 790 +#define IMG_CUSTOM_45 791 +#define IMG_CUSTOM_45_EDITOR 792 +#define IMG_CUSTOM_46 793 +#define IMG_CUSTOM_46_EDITOR 794 +#define IMG_CUSTOM_47 795 +#define IMG_CUSTOM_47_EDITOR 796 +#define IMG_CUSTOM_48 797 +#define IMG_CUSTOM_48_EDITOR 798 +#define IMG_CUSTOM_49 799 +#define IMG_CUSTOM_49_EDITOR 800 +#define IMG_CUSTOM_50 801 +#define IMG_CUSTOM_50_EDITOR 802 +#define IMG_CUSTOM_51 803 +#define IMG_CUSTOM_51_EDITOR 804 +#define IMG_CUSTOM_52 805 +#define IMG_CUSTOM_52_EDITOR 806 +#define IMG_CUSTOM_53 807 +#define IMG_CUSTOM_53_EDITOR 808 +#define IMG_CUSTOM_54 809 +#define IMG_CUSTOM_54_EDITOR 810 +#define IMG_CUSTOM_55 811 +#define IMG_CUSTOM_55_EDITOR 812 +#define IMG_CUSTOM_56 813 +#define IMG_CUSTOM_56_EDITOR 814 +#define IMG_CUSTOM_57 815 +#define IMG_CUSTOM_57_EDITOR 816 +#define IMG_CUSTOM_58 817 +#define IMG_CUSTOM_58_EDITOR 818 +#define IMG_CUSTOM_59 819 +#define IMG_CUSTOM_59_EDITOR 820 +#define IMG_CUSTOM_60 821 +#define IMG_CUSTOM_60_EDITOR 822 +#define IMG_CUSTOM_61 823 +#define IMG_CUSTOM_61_EDITOR 824 +#define IMG_CUSTOM_62 825 +#define IMG_CUSTOM_62_EDITOR 826 +#define IMG_CUSTOM_63 827 +#define IMG_CUSTOM_63_EDITOR 828 +#define IMG_CUSTOM_64 829 +#define IMG_CUSTOM_64_EDITOR 830 +#define IMG_CUSTOM_65 831 +#define IMG_CUSTOM_65_EDITOR 832 +#define IMG_CUSTOM_66 833 +#define IMG_CUSTOM_66_EDITOR 834 +#define IMG_CUSTOM_67 835 +#define IMG_CUSTOM_67_EDITOR 836 +#define IMG_CUSTOM_68 837 +#define IMG_CUSTOM_68_EDITOR 838 +#define IMG_CUSTOM_69 839 +#define IMG_CUSTOM_69_EDITOR 840 +#define IMG_CUSTOM_70 841 +#define IMG_CUSTOM_70_EDITOR 842 +#define IMG_CUSTOM_71 843 +#define IMG_CUSTOM_71_EDITOR 844 +#define IMG_CUSTOM_72 845 +#define IMG_CUSTOM_72_EDITOR 846 +#define IMG_CUSTOM_73 847 +#define IMG_CUSTOM_73_EDITOR 848 +#define IMG_CUSTOM_74 849 +#define IMG_CUSTOM_74_EDITOR 850 +#define IMG_CUSTOM_75 851 +#define IMG_CUSTOM_75_EDITOR 852 +#define IMG_CUSTOM_76 853 +#define IMG_CUSTOM_76_EDITOR 854 +#define IMG_CUSTOM_77 855 +#define IMG_CUSTOM_77_EDITOR 856 +#define IMG_CUSTOM_78 857 +#define IMG_CUSTOM_78_EDITOR 858 +#define IMG_CUSTOM_79 859 +#define IMG_CUSTOM_79_EDITOR 860 +#define IMG_CUSTOM_80 861 +#define IMG_CUSTOM_80_EDITOR 862 +#define IMG_CUSTOM_81 863 +#define IMG_CUSTOM_81_EDITOR 864 +#define IMG_CUSTOM_82 865 +#define IMG_CUSTOM_82_EDITOR 866 +#define IMG_CUSTOM_83 867 +#define IMG_CUSTOM_83_EDITOR 868 +#define IMG_CUSTOM_84 869 +#define IMG_CUSTOM_84_EDITOR 870 +#define IMG_CUSTOM_85 871 +#define IMG_CUSTOM_85_EDITOR 872 +#define IMG_CUSTOM_86 873 +#define IMG_CUSTOM_86_EDITOR 874 +#define IMG_CUSTOM_87 875 +#define IMG_CUSTOM_87_EDITOR 876 +#define IMG_CUSTOM_88 877 +#define IMG_CUSTOM_88_EDITOR 878 +#define IMG_CUSTOM_89 879 +#define IMG_CUSTOM_89_EDITOR 880 +#define IMG_CUSTOM_90 881 +#define IMG_CUSTOM_90_EDITOR 882 +#define IMG_CUSTOM_91 883 +#define IMG_CUSTOM_91_EDITOR 884 +#define IMG_CUSTOM_92 885 +#define IMG_CUSTOM_92_EDITOR 886 +#define IMG_CUSTOM_93 887 +#define IMG_CUSTOM_93_EDITOR 888 +#define IMG_CUSTOM_94 889 +#define IMG_CUSTOM_94_EDITOR 890 +#define IMG_CUSTOM_95 891 +#define IMG_CUSTOM_95_EDITOR 892 +#define IMG_CUSTOM_96 893 +#define IMG_CUSTOM_96_EDITOR 894 +#define IMG_CUSTOM_97 895 +#define IMG_CUSTOM_97_EDITOR 896 +#define IMG_CUSTOM_98 897 +#define IMG_CUSTOM_98_EDITOR 898 +#define IMG_CUSTOM_99 899 +#define IMG_CUSTOM_99_EDITOR 900 +#define IMG_CUSTOM_100 901 +#define IMG_CUSTOM_100_EDITOR 902 +#define IMG_CUSTOM_101 903 +#define IMG_CUSTOM_101_EDITOR 904 +#define IMG_CUSTOM_102 905 +#define IMG_CUSTOM_102_EDITOR 906 +#define IMG_CUSTOM_103 907 +#define IMG_CUSTOM_103_EDITOR 908 +#define IMG_CUSTOM_104 909 +#define IMG_CUSTOM_104_EDITOR 910 +#define IMG_CUSTOM_105 911 +#define IMG_CUSTOM_105_EDITOR 912 +#define IMG_CUSTOM_106 913 +#define IMG_CUSTOM_106_EDITOR 914 +#define IMG_CUSTOM_107 915 +#define IMG_CUSTOM_107_EDITOR 916 +#define IMG_CUSTOM_108 917 +#define IMG_CUSTOM_108_EDITOR 918 +#define IMG_CUSTOM_109 919 +#define IMG_CUSTOM_109_EDITOR 920 +#define IMG_CUSTOM_110 921 +#define IMG_CUSTOM_110_EDITOR 922 +#define IMG_CUSTOM_111 923 +#define IMG_CUSTOM_111_EDITOR 924 +#define IMG_CUSTOM_112 925 +#define IMG_CUSTOM_112_EDITOR 926 +#define IMG_CUSTOM_113 927 +#define IMG_CUSTOM_113_EDITOR 928 +#define IMG_CUSTOM_114 929 +#define IMG_CUSTOM_114_EDITOR 930 +#define IMG_CUSTOM_115 931 +#define IMG_CUSTOM_115_EDITOR 932 +#define IMG_CUSTOM_116 933 +#define IMG_CUSTOM_116_EDITOR 934 +#define IMG_CUSTOM_117 935 +#define IMG_CUSTOM_117_EDITOR 936 +#define IMG_CUSTOM_118 937 +#define IMG_CUSTOM_118_EDITOR 938 +#define IMG_CUSTOM_119 939 +#define IMG_CUSTOM_119_EDITOR 940 +#define IMG_CUSTOM_120 941 +#define IMG_CUSTOM_120_EDITOR 942 +#define IMG_CUSTOM_121 943 +#define IMG_CUSTOM_121_EDITOR 944 +#define IMG_CUSTOM_122 945 +#define IMG_CUSTOM_122_EDITOR 946 +#define IMG_CUSTOM_123 947 +#define IMG_CUSTOM_123_EDITOR 948 +#define IMG_CUSTOM_124 949 +#define IMG_CUSTOM_124_EDITOR 950 +#define IMG_CUSTOM_125 951 +#define IMG_CUSTOM_125_EDITOR 952 +#define IMG_CUSTOM_126 953 +#define IMG_CUSTOM_126_EDITOR 954 +#define IMG_CUSTOM_127 955 +#define IMG_CUSTOM_127_EDITOR 956 +#define IMG_CUSTOM_128 957 +#define IMG_CUSTOM_128_EDITOR 958 +#define IMG_CUSTOM_129 959 +#define IMG_CUSTOM_129_EDITOR 960 +#define IMG_CUSTOM_130 961 +#define IMG_CUSTOM_130_EDITOR 962 +#define IMG_CUSTOM_131 963 +#define IMG_CUSTOM_131_EDITOR 964 +#define IMG_CUSTOM_132 965 +#define IMG_CUSTOM_132_EDITOR 966 +#define IMG_CUSTOM_133 967 +#define IMG_CUSTOM_133_EDITOR 968 +#define IMG_CUSTOM_134 969 +#define IMG_CUSTOM_134_EDITOR 970 +#define IMG_CUSTOM_135 971 +#define IMG_CUSTOM_135_EDITOR 972 +#define IMG_CUSTOM_136 973 +#define IMG_CUSTOM_136_EDITOR 974 +#define IMG_CUSTOM_137 975 +#define IMG_CUSTOM_137_EDITOR 976 +#define IMG_CUSTOM_138 977 +#define IMG_CUSTOM_138_EDITOR 978 +#define IMG_CUSTOM_139 979 +#define IMG_CUSTOM_139_EDITOR 980 +#define IMG_CUSTOM_140 981 +#define IMG_CUSTOM_140_EDITOR 982 +#define IMG_CUSTOM_141 983 +#define IMG_CUSTOM_141_EDITOR 984 +#define IMG_CUSTOM_142 985 +#define IMG_CUSTOM_142_EDITOR 986 +#define IMG_CUSTOM_143 987 +#define IMG_CUSTOM_143_EDITOR 988 +#define IMG_CUSTOM_144 989 +#define IMG_CUSTOM_144_EDITOR 990 +#define IMG_CUSTOM_145 991 +#define IMG_CUSTOM_145_EDITOR 992 +#define IMG_CUSTOM_146 993 +#define IMG_CUSTOM_146_EDITOR 994 +#define IMG_CUSTOM_147 995 +#define IMG_CUSTOM_147_EDITOR 996 +#define IMG_CUSTOM_148 997 +#define IMG_CUSTOM_148_EDITOR 998 +#define IMG_CUSTOM_149 999 +#define IMG_CUSTOM_149_EDITOR 1000 +#define IMG_CUSTOM_150 1001 +#define IMG_CUSTOM_150_EDITOR 1002 +#define IMG_CUSTOM_151 1003 +#define IMG_CUSTOM_151_EDITOR 1004 +#define IMG_CUSTOM_152 1005 +#define IMG_CUSTOM_152_EDITOR 1006 +#define IMG_CUSTOM_153 1007 +#define IMG_CUSTOM_153_EDITOR 1008 +#define IMG_CUSTOM_154 1009 +#define IMG_CUSTOM_154_EDITOR 1010 +#define IMG_CUSTOM_155 1011 +#define IMG_CUSTOM_155_EDITOR 1012 +#define IMG_CUSTOM_156 1013 +#define IMG_CUSTOM_156_EDITOR 1014 +#define IMG_CUSTOM_157 1015 +#define IMG_CUSTOM_157_EDITOR 1016 +#define IMG_CUSTOM_158 1017 +#define IMG_CUSTOM_158_EDITOR 1018 +#define IMG_CUSTOM_159 1019 +#define IMG_CUSTOM_159_EDITOR 1020 +#define IMG_CUSTOM_160 1021 +#define IMG_CUSTOM_160_EDITOR 1022 +#define IMG_CUSTOM_161 1023 +#define IMG_CUSTOM_161_EDITOR 1024 +#define IMG_CUSTOM_162 1025 +#define IMG_CUSTOM_162_EDITOR 1026 +#define IMG_CUSTOM_163 1027 +#define IMG_CUSTOM_163_EDITOR 1028 +#define IMG_CUSTOM_164 1029 +#define IMG_CUSTOM_164_EDITOR 1030 +#define IMG_CUSTOM_165 1031 +#define IMG_CUSTOM_165_EDITOR 1032 +#define IMG_CUSTOM_166 1033 +#define IMG_CUSTOM_166_EDITOR 1034 +#define IMG_CUSTOM_167 1035 +#define IMG_CUSTOM_167_EDITOR 1036 +#define IMG_CUSTOM_168 1037 +#define IMG_CUSTOM_168_EDITOR 1038 +#define IMG_CUSTOM_169 1039 +#define IMG_CUSTOM_169_EDITOR 1040 +#define IMG_CUSTOM_170 1041 +#define IMG_CUSTOM_170_EDITOR 1042 +#define IMG_CUSTOM_171 1043 +#define IMG_CUSTOM_171_EDITOR 1044 +#define IMG_CUSTOM_172 1045 +#define IMG_CUSTOM_172_EDITOR 1046 +#define IMG_CUSTOM_173 1047 +#define IMG_CUSTOM_173_EDITOR 1048 +#define IMG_CUSTOM_174 1049 +#define IMG_CUSTOM_174_EDITOR 1050 +#define IMG_CUSTOM_175 1051 +#define IMG_CUSTOM_175_EDITOR 1052 +#define IMG_CUSTOM_176 1053 +#define IMG_CUSTOM_176_EDITOR 1054 +#define IMG_CUSTOM_177 1055 +#define IMG_CUSTOM_177_EDITOR 1056 +#define IMG_CUSTOM_178 1057 +#define IMG_CUSTOM_178_EDITOR 1058 +#define IMG_CUSTOM_179 1059 +#define IMG_CUSTOM_179_EDITOR 1060 +#define IMG_CUSTOM_180 1061 +#define IMG_CUSTOM_180_EDITOR 1062 +#define IMG_CUSTOM_181 1063 +#define IMG_CUSTOM_181_EDITOR 1064 +#define IMG_CUSTOM_182 1065 +#define IMG_CUSTOM_182_EDITOR 1066 +#define IMG_CUSTOM_183 1067 +#define IMG_CUSTOM_183_EDITOR 1068 +#define IMG_CUSTOM_184 1069 +#define IMG_CUSTOM_184_EDITOR 1070 +#define IMG_CUSTOM_185 1071 +#define IMG_CUSTOM_185_EDITOR 1072 +#define IMG_CUSTOM_186 1073 +#define IMG_CUSTOM_186_EDITOR 1074 +#define IMG_CUSTOM_187 1075 +#define IMG_CUSTOM_187_EDITOR 1076 +#define IMG_CUSTOM_188 1077 +#define IMG_CUSTOM_188_EDITOR 1078 +#define IMG_CUSTOM_189 1079 +#define IMG_CUSTOM_189_EDITOR 1080 +#define IMG_CUSTOM_190 1081 +#define IMG_CUSTOM_190_EDITOR 1082 +#define IMG_CUSTOM_191 1083 +#define IMG_CUSTOM_191_EDITOR 1084 +#define IMG_CUSTOM_192 1085 +#define IMG_CUSTOM_192_EDITOR 1086 +#define IMG_CUSTOM_193 1087 +#define IMG_CUSTOM_193_EDITOR 1088 +#define IMG_CUSTOM_194 1089 +#define IMG_CUSTOM_194_EDITOR 1090 +#define IMG_CUSTOM_195 1091 +#define IMG_CUSTOM_195_EDITOR 1092 +#define IMG_CUSTOM_196 1093 +#define IMG_CUSTOM_196_EDITOR 1094 +#define IMG_CUSTOM_197 1095 +#define IMG_CUSTOM_197_EDITOR 1096 +#define IMG_CUSTOM_198 1097 +#define IMG_CUSTOM_198_EDITOR 1098 +#define IMG_CUSTOM_199 1099 +#define IMG_CUSTOM_199_EDITOR 1100 +#define IMG_CUSTOM_200 1101 +#define IMG_CUSTOM_200_EDITOR 1102 +#define IMG_CUSTOM_201 1103 +#define IMG_CUSTOM_201_EDITOR 1104 +#define IMG_CUSTOM_202 1105 +#define IMG_CUSTOM_202_EDITOR 1106 +#define IMG_CUSTOM_203 1107 +#define IMG_CUSTOM_203_EDITOR 1108 +#define IMG_CUSTOM_204 1109 +#define IMG_CUSTOM_204_EDITOR 1110 +#define IMG_CUSTOM_205 1111 +#define IMG_CUSTOM_205_EDITOR 1112 +#define IMG_CUSTOM_206 1113 +#define IMG_CUSTOM_206_EDITOR 1114 +#define IMG_CUSTOM_207 1115 +#define IMG_CUSTOM_207_EDITOR 1116 +#define IMG_CUSTOM_208 1117 +#define IMG_CUSTOM_208_EDITOR 1118 +#define IMG_CUSTOM_209 1119 +#define IMG_CUSTOM_209_EDITOR 1120 +#define IMG_CUSTOM_210 1121 +#define IMG_CUSTOM_210_EDITOR 1122 +#define IMG_CUSTOM_211 1123 +#define IMG_CUSTOM_211_EDITOR 1124 +#define IMG_CUSTOM_212 1125 +#define IMG_CUSTOM_212_EDITOR 1126 +#define IMG_CUSTOM_213 1127 +#define IMG_CUSTOM_213_EDITOR 1128 +#define IMG_CUSTOM_214 1129 +#define IMG_CUSTOM_214_EDITOR 1130 +#define IMG_CUSTOM_215 1131 +#define IMG_CUSTOM_215_EDITOR 1132 +#define IMG_CUSTOM_216 1133 +#define IMG_CUSTOM_216_EDITOR 1134 +#define IMG_CUSTOM_217 1135 +#define IMG_CUSTOM_217_EDITOR 1136 +#define IMG_CUSTOM_218 1137 +#define IMG_CUSTOM_218_EDITOR 1138 +#define IMG_CUSTOM_219 1139 +#define IMG_CUSTOM_219_EDITOR 1140 +#define IMG_CUSTOM_220 1141 +#define IMG_CUSTOM_220_EDITOR 1142 +#define IMG_CUSTOM_221 1143 +#define IMG_CUSTOM_221_EDITOR 1144 +#define IMG_CUSTOM_222 1145 +#define IMG_CUSTOM_222_EDITOR 1146 +#define IMG_CUSTOM_223 1147 +#define IMG_CUSTOM_223_EDITOR 1148 +#define IMG_CUSTOM_224 1149 +#define IMG_CUSTOM_224_EDITOR 1150 +#define IMG_CUSTOM_225 1151 +#define IMG_CUSTOM_225_EDITOR 1152 +#define IMG_CUSTOM_226 1153 +#define IMG_CUSTOM_226_EDITOR 1154 +#define IMG_CUSTOM_227 1155 +#define IMG_CUSTOM_227_EDITOR 1156 +#define IMG_CUSTOM_228 1157 +#define IMG_CUSTOM_228_EDITOR 1158 +#define IMG_CUSTOM_229 1159 +#define IMG_CUSTOM_229_EDITOR 1160 +#define IMG_CUSTOM_230 1161 +#define IMG_CUSTOM_230_EDITOR 1162 +#define IMG_CUSTOM_231 1163 +#define IMG_CUSTOM_231_EDITOR 1164 +#define IMG_CUSTOM_232 1165 +#define IMG_CUSTOM_232_EDITOR 1166 +#define IMG_CUSTOM_233 1167 +#define IMG_CUSTOM_233_EDITOR 1168 +#define IMG_CUSTOM_234 1169 +#define IMG_CUSTOM_234_EDITOR 1170 +#define IMG_CUSTOM_235 1171 +#define IMG_CUSTOM_235_EDITOR 1172 +#define IMG_CUSTOM_236 1173 +#define IMG_CUSTOM_236_EDITOR 1174 +#define IMG_CUSTOM_237 1175 +#define IMG_CUSTOM_237_EDITOR 1176 +#define IMG_CUSTOM_238 1177 +#define IMG_CUSTOM_238_EDITOR 1178 +#define IMG_CUSTOM_239 1179 +#define IMG_CUSTOM_239_EDITOR 1180 +#define IMG_CUSTOM_240 1181 +#define IMG_CUSTOM_240_EDITOR 1182 +#define IMG_CUSTOM_241 1183 +#define IMG_CUSTOM_241_EDITOR 1184 +#define IMG_CUSTOM_242 1185 +#define IMG_CUSTOM_242_EDITOR 1186 +#define IMG_CUSTOM_243 1187 +#define IMG_CUSTOM_243_EDITOR 1188 +#define IMG_CUSTOM_244 1189 +#define IMG_CUSTOM_244_EDITOR 1190 +#define IMG_CUSTOM_245 1191 +#define IMG_CUSTOM_245_EDITOR 1192 +#define IMG_CUSTOM_246 1193 +#define IMG_CUSTOM_246_EDITOR 1194 +#define IMG_CUSTOM_247 1195 +#define IMG_CUSTOM_247_EDITOR 1196 +#define IMG_CUSTOM_248 1197 +#define IMG_CUSTOM_248_EDITOR 1198 +#define IMG_CUSTOM_249 1199 +#define IMG_CUSTOM_249_EDITOR 1200 +#define IMG_CUSTOM_250 1201 +#define IMG_CUSTOM_250_EDITOR 1202 +#define IMG_CUSTOM_251 1203 +#define IMG_CUSTOM_251_EDITOR 1204 +#define IMG_CUSTOM_252 1205 +#define IMG_CUSTOM_252_EDITOR 1206 +#define IMG_CUSTOM_253 1207 +#define IMG_CUSTOM_253_EDITOR 1208 +#define IMG_CUSTOM_254 1209 +#define IMG_CUSTOM_254_EDITOR 1210 +#define IMG_CUSTOM_255 1211 +#define IMG_CUSTOM_255_EDITOR 1212 +#define IMG_CUSTOM_256 1213 +#define IMG_CUSTOM_256_EDITOR 1214 +#define IMG_TOON_1 1215 +#define IMG_TOON_2 1216 +#define IMG_TOON_3 1217 +#define IMG_TOON_4 1218 +#define IMG_TOON_5 1219 +#define IMG_TOON_6 1220 +#define IMG_TOON_7 1221 +#define IMG_TOON_8 1222 +#define IMG_TOON_9 1223 +#define IMG_TOON_10 1224 +#define IMG_TOON_11 1225 +#define IMG_TOON_12 1226 +#define IMG_TOON_13 1227 +#define IMG_TOON_14 1228 +#define IMG_TOON_15 1229 +#define IMG_TOON_16 1230 +#define IMG_TOON_17 1231 +#define IMG_TOON_18 1232 +#define IMG_TOON_19 1233 +#define IMG_TOON_20 1234 +#define IMG_MENU_CALIBRATE_RED 1235 +#define IMG_MENU_CALIBRATE_BLUE 1236 +#define IMG_MENU_CALIBRATE_YELLOW 1237 +#define IMG_MENU_BUTTON 1238 +#define IMG_MENU_BUTTON_ACTIVE 1239 +#define IMG_MENU_BUTTON_LEFT 1240 +#define IMG_MENU_BUTTON_RIGHT 1241 +#define IMG_MENU_BUTTON_UP 1242 +#define IMG_MENU_BUTTON_DOWN 1243 +#define IMG_MENU_BUTTON_LEFT_ACTIVE 1244 +#define IMG_MENU_BUTTON_RIGHT_ACTIVE 1245 +#define IMG_MENU_BUTTON_UP_ACTIVE 1246 +#define IMG_MENU_BUTTON_DOWN_ACTIVE 1247 +#define IMG_MENU_SCROLLBAR 1248 +#define IMG_MENU_SCROLLBAR_ACTIVE 1249 +#define IMG_FONT_INITIAL_1 1250 +#define IMG_FONT_INITIAL_2 1251 +#define IMG_FONT_INITIAL_3 1252 +#define IMG_FONT_INITIAL_4 1253 +#define IMG_FONT_TITLE_1 1254 +#define IMG_FONT_TITLE_1_LEVELS 1255 +#define IMG_FONT_TITLE_2 1256 +#define IMG_FONT_MENU_1 1257 +#define IMG_FONT_MENU_2 1258 +#define IMG_FONT_TEXT_1 1259 +#define IMG_FONT_TEXT_1_LEVELS 1260 +#define IMG_FONT_TEXT_1_PREVIEW 1261 +#define IMG_FONT_TEXT_1_SCORES 1262 +#define IMG_FONT_TEXT_1_ACTIVE_SCORES 1263 +#define IMG_FONT_TEXT_2 1264 +#define IMG_FONT_TEXT_2_LEVELS 1265 +#define IMG_FONT_TEXT_2_PREVIEW 1266 +#define IMG_FONT_TEXT_2_SCORES 1267 +#define IMG_FONT_TEXT_2_ACTIVE_SCORES 1268 +#define IMG_FONT_TEXT_3 1269 +#define IMG_FONT_TEXT_3_LEVELS 1270 +#define IMG_FONT_TEXT_3_PREVIEW 1271 +#define IMG_FONT_TEXT_3_SCORES 1272 +#define IMG_FONT_TEXT_3_ACTIVE_SCORES 1273 +#define IMG_FONT_TEXT_4 1274 +#define IMG_FONT_TEXT_4_LEVELS 1275 +#define IMG_FONT_TEXT_4_SCORES 1276 +#define IMG_FONT_TEXT_4_ACTIVE_SCORES 1277 +#define IMG_FONT_ENVELOPE_1 1278 +#define IMG_FONT_ENVELOPE_2 1279 +#define IMG_FONT_ENVELOPE_3 1280 +#define IMG_FONT_ENVELOPE_4 1281 +#define IMG_FONT_INPUT_1 1282 +#define IMG_FONT_INPUT_1_MAIN 1283 +#define IMG_FONT_INPUT_1_ACTIVE 1284 +#define IMG_FONT_INPUT_1_ACTIVE_MAIN 1285 +#define IMG_FONT_INPUT_1_ACTIVE_SETUP 1286 +#define IMG_FONT_INPUT_2 1287 +#define IMG_FONT_INPUT_2_ACTIVE 1288 +#define IMG_FONT_OPTION_OFF 1289 +#define IMG_FONT_OPTION_ON 1290 +#define IMG_FONT_VALUE_1 1291 +#define IMG_FONT_VALUE_2 1292 +#define IMG_FONT_VALUE_OLD 1293 +#define IMG_FONT_LEVEL_NUMBER 1294 +#define IMG_FONT_TAPE_RECORDER 1295 +#define IMG_FONT_GAME_INFO 1296 +#define IMG_GLOBAL_BORDER 1297 +#define IMG_GLOBAL_DOOR 1298 +#define IMG_EDITOR_ELEMENT_BORDER 1299 +#define IMG_EDITOR_ELEMENT_BORDER_INPUT 1300 +#define IMG_BACKGROUND_ENVELOPE_1 1301 +#define IMG_BACKGROUND_ENVELOPE_2 1302 +#define IMG_BACKGROUND_ENVELOPE_3 1303 +#define IMG_BACKGROUND_ENVELOPE_4 1304 +#define IMG_BACKGROUND 1305 +#define IMG_BACKGROUND_MAIN 1306 +#define IMG_BACKGROUND_LEVELS 1307 +#define IMG_BACKGROUND_SCORES 1308 +#define IMG_BACKGROUND_EDITOR 1309 +#define IMG_BACKGROUND_INFO 1310 +#define IMG_BACKGROUND_SETUP 1311 +#define IMG_BACKGROUND_DOOR 1312 -#define NUM_IMAGE_FILES 1312 +#define NUM_IMAGE_FILES 1313 #endif /* CONF_GFX_H */ diff --git a/src/conftime.h b/src/conftime.h index cfd9fb62..2ec21bcf 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "[2003-12-03 01:50]" +#define COMPILE_DATE_STRING "[2003-12-05 00:32]" diff --git a/src/editor.c b/src/editor.c index e7d70349..11259a9c 100644 --- a/src/editor.c +++ b/src/editor.c @@ -1071,6 +1071,8 @@ static struct ValueTextInfo options_move_pattern[] = { MV_TURNING_LEFT, "turning left" }, { MV_TURNING_RIGHT, "turning right" }, { MV_WHEN_PUSHED, "when pushed" }, + { MV_MAZE_RUNNER, "maze runner style" }, + { MV_MAZE_HUNTER, "maze hunter style" }, { -1, NULL } }; @@ -1146,9 +1148,10 @@ static struct ValueTextInfo options_change_direct_action[] = { CE_LEFT_BY_PLAYER, "left by player ..." }, { CE_DROPPED_BY_PLAYER, "dropped by player" }, { CE_SWITCHED, "switched ..." }, - { CE_COLLISION, "collision ..." }, - { CE_IMPACT, "impact" }, - { CE_SMASHED, "smashed" }, + { CE_COLLISION_ACTIVE, "hitting something ..." }, + { CE_COLLISION_PASSIVE, "hit by something ..." }, + { CE_IMPACT, "impact (on something)" }, + { CE_SMASHED, "smashed (from above)" }, { -1, NULL } }; @@ -1163,6 +1166,8 @@ static struct ValueTextInfo options_change_other_action[] = { CE_OTHER_GETS_COLLECTED, "player collects" }, { CE_OTHER_GETS_DROPPED, "player drops" }, { CE_OTHER_IS_TOUCHING, "touching ..." }, + { CE_OTHER_IS_COLL_ACTIVE, "hitting ..." }, + { CE_OTHER_IS_COLL_PASSIVE, "hit by ..." }, { CE_OTHER_IS_SWITCHING, "switch of ..." }, { CE_OTHER_IS_CHANGING, "change of" }, { CE_OTHER_IS_EXPLODING, "explosion of" }, @@ -1177,7 +1182,7 @@ static struct ValueTextInfo options_change_sides[] = { CH_SIDE_BOTTOM, "bottom side" }, { CH_SIDE_LEFT_RIGHT, "left/right side" }, { CH_SIDE_TOP_BOTTOM, "top/bottom side" }, - { CH_SIDE_ANY, "all sides" }, + { CH_SIDE_ANY, "any side" }, { -1, NULL } }; @@ -2133,7 +2138,7 @@ static int editor_el_more[] = EL_BD_FIREFLY, EL_MOLE_LEFT, - EL_EMPTY, + EL_MAZE_RUNNER, EL_MOLE_RIGHT, EL_PACMAN, @@ -4967,7 +4972,8 @@ static void CopyCustomElementPropertiesToEditor(int element) HAS_CHANGE_EVENT(element, CE_LEFT_BY_PLAYER) ? CE_LEFT_BY_PLAYER : HAS_CHANGE_EVENT(element, CE_DROPPED_BY_PLAYER) ? CE_DROPPED_BY_PLAYER : HAS_CHANGE_EVENT(element, CE_SWITCHED) ? CE_SWITCHED : - HAS_CHANGE_EVENT(element, CE_COLLISION) ? CE_COLLISION : + HAS_CHANGE_EVENT(element, CE_COLLISION_ACTIVE) ? CE_COLLISION_ACTIVE : + HAS_CHANGE_EVENT(element, CE_COLLISION_PASSIVE) ? CE_COLLISION_PASSIVE : HAS_CHANGE_EVENT(element, CE_IMPACT) ? CE_IMPACT : HAS_CHANGE_EVENT(element, CE_SMASHED) ? CE_SMASHED : custom_element_change.direct_action); @@ -4983,6 +4989,8 @@ static void CopyCustomElementPropertiesToEditor(int element) HAS_CHANGE_EVENT(element, CE_OTHER_GETS_COLLECTED) ? CE_OTHER_GETS_COLLECTED : HAS_CHANGE_EVENT(element, CE_OTHER_GETS_DROPPED) ? CE_OTHER_GETS_DROPPED : HAS_CHANGE_EVENT(element, CE_OTHER_IS_TOUCHING) ? CE_OTHER_IS_TOUCHING : + HAS_CHANGE_EVENT(element, CE_OTHER_IS_COLL_ACTIVE) ? CE_OTHER_IS_COLL_ACTIVE : + HAS_CHANGE_EVENT(element, CE_OTHER_IS_COLL_PASSIVE) ? CE_OTHER_IS_COLL_PASSIVE : HAS_CHANGE_EVENT(element, CE_OTHER_IS_SWITCHING) ? CE_OTHER_IS_SWITCHING : HAS_CHANGE_EVENT(element, CE_OTHER_IS_CHANGING) ? CE_OTHER_IS_CHANGING : HAS_CHANGE_EVENT(element, CE_OTHER_IS_EXPLODING) ? CE_OTHER_IS_EXPLODING : @@ -5085,7 +5093,8 @@ static void CopyCustomElementPropertiesToGame(int element) custom_element_change_events[CE_LEFT_BY_PLAYER] = FALSE; custom_element_change_events[CE_DROPPED_BY_PLAYER] = FALSE; custom_element_change_events[CE_SWITCHED] = FALSE; - custom_element_change_events[CE_COLLISION] = FALSE; + custom_element_change_events[CE_COLLISION_ACTIVE] = FALSE; + custom_element_change_events[CE_COLLISION_PASSIVE] = FALSE; custom_element_change_events[CE_IMPACT] = FALSE; custom_element_change_events[CE_SMASHED] = FALSE; custom_element_change_events[custom_element_change.direct_action] = @@ -5101,6 +5110,8 @@ static void CopyCustomElementPropertiesToGame(int element) custom_element_change_events[CE_OTHER_GETS_COLLECTED] = FALSE; custom_element_change_events[CE_OTHER_GETS_DROPPED] = FALSE; custom_element_change_events[CE_OTHER_IS_TOUCHING] = FALSE; + custom_element_change_events[CE_OTHER_IS_COLL_ACTIVE] = FALSE; + custom_element_change_events[CE_OTHER_IS_COLL_PASSIVE] = FALSE; custom_element_change_events[CE_OTHER_IS_SWITCHING] = FALSE; custom_element_change_events[CE_OTHER_IS_CHANGING] = FALSE; custom_element_change_events[CE_OTHER_IS_EXPLODING] = FALSE; @@ -6817,7 +6828,10 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) /* clicking into drawing area with pressed Control key picks element */ if (GetKeyModState() & KMOD_Control) + { + last_drawing_function = drawing_function; actual_drawing_function = GADGET_ID_PICK_ELEMENT; + } switch (actual_drawing_function) { diff --git a/src/events.c b/src/events.c index ffd02895..5af02c55 100644 --- a/src/events.c +++ b/src/events.c @@ -438,6 +438,8 @@ void HandleButton(int mx, int my, int button) printf(" GfxElement[%d][%d] == %d\n", x,y, GfxElement[x][y]); printf(" GfxAction[%d][%d] == %d\n", x,y, GfxAction[x][y]); printf(" GfxFrame[%d][%d] == %d\n", x,y, GfxFrame[x][y]); + printf(" RunnerVisit[%d][%d] == %d\n", x,y, RunnerVisit[x][y]); + printf(" PlayerVisit[%d][%d] == %d\n", x,y, PlayerVisit[x][y]); printf("\n"); } } diff --git a/src/files.c b/src/files.c index 8233ac51..5ff8c06a 100644 --- a/src/files.c +++ b/src/files.c @@ -1032,7 +1032,7 @@ static void LoadLevel_InitElements(struct LevelInfo *level, char *filename) int element = EL_CUSTOM_START + i; /* order of checking and copying events to be mapped is important */ - for (j = CE_BY_OTHER_ACTION; j >= CE_BY_PLAYER; j--) + for (j = CE_BY_OTHER_ACTION; j >= CE_BY_PLAYER_OBSOLETE; j--) { if (HAS_CHANGE_EVENT(element, j - 2)) { @@ -1042,7 +1042,7 @@ static void LoadLevel_InitElements(struct LevelInfo *level, char *filename) } /* order of checking and copying events to be mapped is important */ - for (j = CE_OTHER_GETS_COLLECTED; j >= CE_COLLISION; j--) + for (j = CE_OTHER_GETS_COLLECTED; j >= CE_COLLISION_ACTIVE; j--) { if (HAS_CHANGE_EVENT(element, j - 1)) { @@ -1058,11 +1058,11 @@ static void LoadLevel_InitElements(struct LevelInfo *level, char *filename) { int element = EL_CUSTOM_START + i; - if (HAS_CHANGE_EVENT(element, CE_BY_PLAYER) || - HAS_CHANGE_EVENT(element, CE_BY_COLLISION)) + if (HAS_CHANGE_EVENT(element, CE_BY_PLAYER_OBSOLETE) || + HAS_CHANGE_EVENT(element, CE_BY_COLLISION_OBSOLETE)) { - SET_CHANGE_EVENT(element, CE_BY_PLAYER, FALSE); - SET_CHANGE_EVENT(element, CE_BY_COLLISION, FALSE); + SET_CHANGE_EVENT(element, CE_BY_PLAYER_OBSOLETE, FALSE); + SET_CHANGE_EVENT(element, CE_BY_COLLISION_OBSOLETE, FALSE); SET_CHANGE_EVENT(element, CE_BY_DIRECT_ACTION, TRUE); } @@ -2945,10 +2945,19 @@ void LoadMusicInfo() new = &music_file_info; + printf("::: num_music == %d\n", num_music); + for (i = 0; i < num_music; i++) { music = getMusicListEntry(i); +#if 0 + printf("::: %d [%08x]\n", i, music->filename); +#endif + + if (music->filename == NULL) + continue; + if (strcmp(music->filename, UNDEFINED_FILENAME) == 0) continue; @@ -2981,6 +2990,9 @@ void LoadMusicInfo() { music = getMusicListEntry(i); + if (music->filename == NULL) + continue; + if (strcmp(basename, music->filename) == 0) { music_already_used = TRUE; diff --git a/src/game.c b/src/game.c index 36e0701e..855e331a 100644 --- a/src/game.c +++ b/src/game.c @@ -144,6 +144,10 @@ Feld[x][y] == EL_EXIT_OPEN || \ Feld[x][y] == EL_ACID)) +#define MAZE_RUNNER_CAN_ENTER_FIELD(x, y) \ + (IN_LEV_FIELD(x, y) && (IS_FREE(x, y) || \ + IS_FOOD_DARK_YAMYAM(Feld[x][y]))) + #define MOLE_CAN_ENTER_FIELD(x, y, condition) \ (IN_LEV_FIELD(x, y) && (IS_FREE(x, y) || (condition))) @@ -1050,6 +1054,8 @@ void InitGame() player->actual_frame_counter = 0; + player->step_counter = 0; + player->last_move_dir = MV_NO_MOVING; player->is_waiting = FALSE; @@ -1196,6 +1202,9 @@ void InitGame() ExplodePhase[x][y] = 0; ExplodeField[x][y] = EX_NO_EXPLOSION; + RunnerVisit[x][y] = 0; + PlayerVisit[x][y] = 0; + GfxFrame[x][y] = 0; GfxRandom[x][y] = INIT_GFX_RANDOM(); GfxElement[x][y] = EL_UNDEFINED; @@ -3273,6 +3282,8 @@ inline static void TurnRoundExt(int x, int y) }; int element = Feld[x][y]; + int move_pattern = element_info[element].move_pattern; + int old_move_dir = MovDir[x][y]; int left_dir = turn[old_move_dir].left; int right_dir = turn[old_move_dir].right; @@ -3667,16 +3678,16 @@ inline static void TurnRoundExt(int x, int y) } } } - else if (element_info[element].move_pattern == MV_ALL_DIRECTIONS || - element_info[element].move_pattern == MV_TURNING_LEFT || - element_info[element].move_pattern == MV_TURNING_RIGHT) + else if (move_pattern == MV_ALL_DIRECTIONS || + move_pattern == MV_TURNING_LEFT || + move_pattern == MV_TURNING_RIGHT) { boolean can_turn_left = ELEMENT_CAN_ENTER_FIELD(element, left_x, left_y); boolean can_turn_right = ELEMENT_CAN_ENTER_FIELD(element, right_x,right_y); - if (element_info[element].move_pattern == MV_TURNING_LEFT) + if (move_pattern == MV_TURNING_LEFT) MovDir[x][y] = left_dir; - else if (element_info[element].move_pattern == MV_TURNING_RIGHT) + else if (move_pattern == MV_TURNING_RIGHT) MovDir[x][y] = right_dir; else if (can_turn_left && can_turn_right) MovDir[x][y] = (RND(3) ? (RND(2) ? left_dir : right_dir) : back_dir); @@ -3689,24 +3700,24 @@ inline static void TurnRoundExt(int x, int y) MovDelay[x][y] = GET_NEW_MOVE_DELAY(element); } - else if (element_info[element].move_pattern == MV_HORIZONTAL || - element_info[element].move_pattern == MV_VERTICAL) + else if (move_pattern == MV_HORIZONTAL || + move_pattern == MV_VERTICAL) { - if (element_info[element].move_pattern & old_move_dir) + if (move_pattern & old_move_dir) MovDir[x][y] = back_dir; - else if (element_info[element].move_pattern == MV_HORIZONTAL) + else if (move_pattern == MV_HORIZONTAL) MovDir[x][y] = (RND(2) ? MV_LEFT : MV_RIGHT); - else if (element_info[element].move_pattern == MV_VERTICAL) + else if (move_pattern == MV_VERTICAL) MovDir[x][y] = (RND(2) ? MV_UP : MV_DOWN); MovDelay[x][y] = GET_NEW_MOVE_DELAY(element); } - else if (element_info[element].move_pattern & MV_ANY_DIRECTION) + else if (move_pattern & MV_ANY_DIRECTION) { - MovDir[x][y] = element_info[element].move_pattern; + MovDir[x][y] = move_pattern; MovDelay[x][y] = GET_NEW_MOVE_DELAY(element); } - else if (element_info[element].move_pattern == MV_ALONG_LEFT_SIDE) + else if (move_pattern == MV_ALONG_LEFT_SIDE) { if (ELEMENT_CAN_ENTER_FIELD(element, left_x, left_y)) MovDir[x][y] = left_dir; @@ -3716,7 +3727,7 @@ inline static void TurnRoundExt(int x, int y) if (MovDir[x][y] != old_move_dir) MovDelay[x][y] = GET_NEW_MOVE_DELAY(element); } - else if (element_info[element].move_pattern == MV_ALONG_RIGHT_SIDE) + else if (move_pattern == MV_ALONG_RIGHT_SIDE) { if (ELEMENT_CAN_ENTER_FIELD(element, right_x, right_y)) MovDir[x][y] = right_dir; @@ -3726,13 +3737,12 @@ inline static void TurnRoundExt(int x, int y) if (MovDir[x][y] != old_move_dir) MovDelay[x][y] = GET_NEW_MOVE_DELAY(element); } - else if (element_info[element].move_pattern == MV_TOWARDS_PLAYER || - element_info[element].move_pattern == MV_AWAY_FROM_PLAYER) + else if (move_pattern == MV_TOWARDS_PLAYER || + move_pattern == MV_AWAY_FROM_PLAYER) { int attr_x = -1, attr_y = -1; int newx, newy; - boolean move_away = - (element_info[element].move_pattern == MV_AWAY_FROM_PLAYER); + boolean move_away = (move_pattern == MV_AWAY_FROM_PLAYER); if (AllPlayersGone) { @@ -3794,13 +3804,84 @@ inline static void TurnRoundExt(int x, int y) MovDir[x][y] = old_move_dir; } } - else if (element_info[element].move_pattern == MV_WHEN_PUSHED) + else if (move_pattern == MV_WHEN_PUSHED) { if (!IN_LEV_FIELD_AND_IS_FREE(move_x, move_y)) MovDir[x][y] = MV_NO_MOVING; MovDelay[x][y] = 0; } + else if (move_pattern & MV_MAZE_RUNNER_STYLE || + element == EL_MAZE_RUNNER) + { + static int test_xy[7][2] = + { + { 0, -1 }, + { -1, 0 }, + { +1, 0 }, + { 0, +1 }, + { 0, -1 }, + { -1, 0 }, + { +1, 0 }, + }; + static int test_dir[7] = + { + MV_UP, + MV_LEFT, + MV_RIGHT, + MV_DOWN, + MV_UP, + MV_LEFT, + MV_RIGHT, + }; + boolean hunter_mode = (move_pattern == MV_MAZE_HUNTER); + int move_preference = -1000000; /* start with very low preference */ + int new_move_dir = MV_NO_MOVING; + int start_test = RND(4); + int i; + + for (i = 0; i < 4; i++) + { + int move_dir = test_dir[start_test + i]; + int move_dir_preference; + + xx = x + test_xy[start_test + i][0]; + yy = y + test_xy[start_test + i][1]; + + if (hunter_mode && IN_LEV_FIELD(xx, yy) && + (IS_PLAYER(xx, yy) || Feld[xx][yy] == EL_PLAYER_IS_LEAVING)) + { + new_move_dir = move_dir; + + break; + } + + if (!MAZE_RUNNER_CAN_ENTER_FIELD(xx, yy)) + continue; + + move_dir_preference = -1 * RunnerVisit[xx][yy]; + if (hunter_mode && PlayerVisit[xx][yy] > 0) + move_dir_preference = PlayerVisit[xx][yy]; + + if (move_dir_preference > move_preference) + { + /* prefer field that has not been visited for the longest time */ + move_preference = move_dir_preference; + new_move_dir = move_dir; + } + else if (move_dir_preference == move_preference && + move_dir == old_move_dir) + { + /* prefer last direction when all directions are preferred equally */ + move_preference = move_dir_preference; + new_move_dir = move_dir; + } + } + + MovDir[x][y] = new_move_dir; + if (old_move_dir != new_move_dir) + MovDelay[x][y] = 9; + } } static void TurnRound(int x, int y) @@ -4141,6 +4222,7 @@ void StartMoving(int x, int y) /* not "else if" because of elements that can fall and move (EL_SPRING) */ if (CAN_MOVE(element) && !started_moving) { + int move_pattern = element_info[element].move_pattern; int newx, newy; #if 1 @@ -4181,9 +4263,9 @@ void StartMoving(int x, int y) if (element != EL_YAMYAM && element != EL_DARK_YAMYAM && element != EL_PACMAN && - !(element_info[element].move_pattern & MV_ANY_DIRECTION) && - element_info[element].move_pattern != MV_TURNING_LEFT && - element_info[element].move_pattern != MV_TURNING_RIGHT) + !(move_pattern & MV_ANY_DIRECTION) && + move_pattern != MV_TURNING_LEFT && + move_pattern != MV_TURNING_RIGHT) { TurnRound(x, y); @@ -4410,6 +4492,35 @@ void StartMoving(int x, int y) return; } } + else if ((move_pattern & MV_MAZE_RUNNER_STYLE || + element == EL_MAZE_RUNNER) && IN_LEV_FIELD(newx, newy)) + { + if (IS_FOOD_DARK_YAMYAM(Feld[newx][newy])) + { + if (IS_MOVING(newx, newy)) + RemoveMovingField(newx, newy); + else + { + Feld[newx][newy] = EL_EMPTY; + DrawLevelField(newx, newy); + } + + PlayLevelSound(x, y, SND_DARK_YAMYAM_DIGGING); + } + else if (!IS_FREE(newx, newy)) + { +#if 0 + if (IS_PLAYER(x, y)) + DrawPlayerField(x, y); + else + DrawLevelField(x, y); +#endif + return; + } + + RunnerVisit[x][y] = FrameCounter; + PlayerVisit[x][y] /= 8; /* expire player visit path */ + } else if (element == EL_DRAGON && IN_LEV_FIELD(newx, newy)) { if (!IS_FREE(newx, newy)) @@ -4762,8 +4873,79 @@ void ContinueMoving(int x, int y) #endif if (!IN_LEV_FIELD(nextx, nexty) || !IS_FREE(nextx, nexty)) - CheckElementSideChange(newx, newy, Feld[newx][newy], direction, - CE_COLLISION, -1); + { + /* !!! fix side (direction) orientation here and elsewhere !!! */ + CheckElementSideChange(newx, newy, Feld[newx][newy], + direction, CE_COLLISION_ACTIVE, -1); + + if (IN_LEV_FIELD(nextx, nexty)) + { + static int opposite_directions[] = + { + MV_RIGHT, + MV_LEFT, + MV_DOWN, + MV_UP + }; + int move_dir_bit = MV_DIR_BIT(direction); + int opposite_direction = opposite_directions[move_dir_bit]; + int hitting_side = direction; + int touched_side = opposite_direction; + int hitting_element = Feld[newx][newy]; + int touched_element = MovingOrBlocked2Element(nextx, nexty); + boolean object_hit = (!IS_MOVING(nextx, nexty) || + MovDir[nextx][nexty] != direction || + ABS(MovPos[nextx][nexty]) <= TILEY / 2); + + if (object_hit) + { + int i; + + CheckElementSideChange(nextx, nexty, Feld[nextx][nexty], + opposite_direction, CE_COLLISION_PASSIVE, -1); + + if (IS_CUSTOM_ELEMENT(hitting_element) && + HAS_ANY_CHANGE_EVENT(hitting_element, CE_OTHER_IS_COLL_ACTIVE)) + { + for (i = 0; i < element_info[hitting_element].num_change_pages; i++) + { + struct ElementChangeInfo *change = + &element_info[hitting_element].change_page[i]; + + if (change->can_change && + change->events & CH_EVENT_BIT(CE_OTHER_IS_COLL_ACTIVE) && + change->sides & touched_side && + change->trigger_element == touched_element) + { + CheckElementSideChange(newx, newy, hitting_element, + CH_SIDE_ANY, CE_OTHER_IS_COLL_ACTIVE, i); + break; + } + } + } + + if (IS_CUSTOM_ELEMENT(touched_element) && + HAS_ANY_CHANGE_EVENT(touched_element, CE_OTHER_IS_COLL_PASSIVE)) + { + for (i = 0; i < element_info[touched_element].num_change_pages; i++) + { + struct ElementChangeInfo *change = + &element_info[touched_element].change_page[i]; + + if (change->can_change && + change->events & CH_EVENT_BIT(CE_OTHER_IS_COLL_PASSIVE) && + change->sides & hitting_side && + change->trigger_element == hitting_element) + { + CheckElementSideChange(nextx, nexty, touched_element, + CH_SIDE_ANY, CE_OTHER_IS_COLL_PASSIVE, i); + break; + } + } + } + } + } + } TestIfPlayerTouchesCustomElement(newx, newy); TestIfElementTouchesCustomElement(newx, newy); @@ -7001,6 +7183,10 @@ boolean MovePlayerOneStep(struct PlayerInfo *player, player->MovPos = (dx > 0 || dy > 0 ? -1 : 1) * (TILEX - TILEX / player->move_delay_value); + player->step_counter++; + + PlayerVisit[jx][jy] = FrameCounter; + ScrollPlayer(player, SCROLL_INIT); #if 0 @@ -7442,7 +7628,7 @@ void TestIfElementTouchesCustomElement(int x, int y) }; static int change_sides[4][2] = { - /* center side border side */ + /* center side border side */ { CH_SIDE_TOP, CH_SIDE_BOTTOM }, /* check top */ { CH_SIDE_LEFT, CH_SIDE_RIGHT }, /* check left */ { CH_SIDE_RIGHT, CH_SIDE_LEFT }, /* check right */ diff --git a/src/init.c b/src/init.c index 6b535794..be4422c6 100644 --- a/src/init.c +++ b/src/init.c @@ -1831,6 +1831,7 @@ void InitElementPropertiesStatic() EL_SP_ELECTRON, EL_BALLOON, EL_SPRING, + EL_MAZE_RUNNER, -1 }; diff --git a/src/libgame/sound.c b/src/libgame/sound.c index ea4e8463..c8d61a82 100644 --- a/src/libgame/sound.c +++ b/src/libgame/sound.c @@ -1885,6 +1885,15 @@ void LoadCustomMusic_NoConf(void) struct dirent *dir_entry; int num_music = getMusicListSize(); +#if 0 + int ii; + for (ii = 0; ii < num_music; ii++) + { + struct FileInfo *music = getMusicListEntry(ii); + printf("sound process: music %d: '%s'\n", ii, music->filename); + } +#endif + if (!audio.sound_available) return; @@ -1920,6 +1929,10 @@ void LoadCustomMusic_NoConf(void) { struct FileInfo *music = getMusicListEntry(i); +#if 0 + printf("sound process: '%s'\n", music->filename); +#endif + if (strcmp(basename, music->filename) == 0) { music_already_used = TRUE; diff --git a/src/main.c b/src/main.c index da163c9e..7e73ba2b 100644 --- a/src/main.c +++ b/src/main.c @@ -60,6 +60,8 @@ short AmoebaCnt[MAX_NUM_AMOEBA]; short AmoebaCnt2[MAX_NUM_AMOEBA]; short ExplodePhase[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; short ExplodeField[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; +int RunnerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; +int PlayerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; unsigned long Properties[MAX_NUM_ELEMENTS][NUM_EP_BITFIELDS]; @@ -434,9 +436,9 @@ struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] = "invisible steel wall" }, { - "unused_63", - "unused", - "(not used)" + "maze_runner", + "maze_runner", + "maze runner" }, { "dynabomb_increase_number", diff --git a/src/main.h b/src/main.h index ff701a20..0ed5442c 100644 --- a/src/main.h +++ b/src/main.h @@ -161,7 +161,7 @@ #define CE_PRESSED_BY_PLAYER 2 #define CE_PUSHED_BY_PLAYER 3 #define CE_DROPPED_BY_PLAYER 4 -#define CE_COLLISION 5 +#define CE_COLLISION_ACTIVE 5 #define CE_IMPACT 6 #define CE_SMASHED 7 #define CE_OTHER_IS_TOUCHING 8 @@ -172,8 +172,8 @@ #define CE_OTHER_GETS_PUSHED 13 #define CE_OTHER_GETS_COLLECTED 14 #define CE_OTHER_GETS_DROPPED 15 -#define CE_BY_PLAYER 16 /* obsolete; now CE_BY_DIRECT_ACTION */ -#define CE_BY_COLLISION 17 /* obsolete; now CE_BY_DIRECT_ACTION */ +#define CE_BY_PLAYER_OBSOLETE 16 /* obsolete; now CE_BY_DIRECT_ACTION */ +#define CE_BY_COLLISION_OBSOLETE 17 /* obsolete; now CE_BY_DIRECT_ACTION */ #define CE_BY_OTHER_ACTION 18 /* activates other element events */ #define CE_BY_DIRECT_ACTION 19 /* activates direct element events */ #define CE_OTHER_GETS_DIGGED 20 @@ -183,8 +183,11 @@ #define CE_OTHER_GETS_LEFT 24 #define CE_SWITCHED 25 #define CE_OTHER_IS_SWITCHING 26 +#define CE_COLLISION_PASSIVE 27 +#define CE_OTHER_IS_COLL_ACTIVE 28 +#define CE_OTHER_IS_COLL_PASSIVE 29 -#define NUM_CHANGE_EVENTS 27 +#define NUM_CHANGE_EVENTS 30 #define CE_BITMASK_DEFAULT 0 @@ -224,6 +227,8 @@ #define MV_BIT_TURNING_LEFT 8 #define MV_BIT_TURNING_RIGHT 9 #define MV_BIT_WHEN_PUSHED 10 +#define MV_BIT_MAZE_RUNNER 11 +#define MV_BIT_MAZE_HUNTER 12 /* values for special move patterns for custom elements */ #define MV_HORIZONTAL (MV_LEFT | MV_RIGHT) @@ -237,6 +242,9 @@ #define MV_TURNING_LEFT (1 << MV_BIT_TURNING_LEFT) #define MV_TURNING_RIGHT (1 << MV_BIT_TURNING_RIGHT) #define MV_WHEN_PUSHED (1 << MV_BIT_WHEN_PUSHED) +#define MV_MAZE_RUNNER (1 << MV_BIT_MAZE_RUNNER) +#define MV_MAZE_HUNTER (1 << MV_BIT_MAZE_HUNTER) +#define MV_MAZE_RUNNER_STYLE (MV_MAZE_RUNNER | MV_MAZE_HUNTER) /* values for slippery property for custom elements */ #define SLIPPERY_ANY_RANDOM 0 @@ -514,7 +522,7 @@ #define EL_BD_MAGIC_WALL 61 #define EL_INVISIBLE_STEELWALL 62 -#define EL_UNUSED_63 63 +#define EL_MAZE_RUNNER 63 #define EL_DYNABOMB_INCREASE_NUMBER 64 #define EL_DYNABOMB_INCREASE_SIZE 65 @@ -1227,6 +1235,8 @@ struct PlayerInfo unsigned long actual_frame_counter; + int step_counter; + int score; int gems_still_needed; int sokobanfields_still_needed; @@ -1615,6 +1625,8 @@ extern short AmoebaCnt[MAX_NUM_AMOEBA]; extern short AmoebaCnt2[MAX_NUM_AMOEBA]; extern short ExplodePhase[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; extern short ExplodeField[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; +extern int RunnerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; +extern int PlayerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; extern unsigned long Properties[MAX_NUM_ELEMENTS][NUM_EP_BITFIELDS];