X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=b84872de4d24db49432b0e830747e95ff2c6e341;hb=86b440840c4a6989a196f0b2af9f4247a20aa218;hp=826d3d212b91f6c63441aad695167739eaf8d4a7;hpb=ce20797c3998436e5c54939ef2f56a4fe4a5b14d;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index 826d3d21..b84872de 100644 --- a/src/main.h +++ b/src/main.h @@ -1570,18 +1570,22 @@ #define EL_MM_WALL_EMPTY EL_MM_WALL_START #define EL_MM_WALL_00 EL_MM_WALL_START #define EL_MM_STEEL_WALL_START EL_MM_WALL_00 +#define EL_MM_STEEL_WALL_1 EL_MM_STEEL_WALL_START #define EL_MM_WALL_15 (EL_MM_START + 47) #define EL_MM_STEEL_WALL_END EL_MM_WALL_15 #define EL_MM_WALL_16 (EL_MM_START + 48) #define EL_MM_WOODEN_WALL_START EL_MM_WALL_16 +#define EL_MM_WOODEN_WALL_1 EL_MM_WOODEN_WALL_START #define EL_MM_WALL_31 (EL_MM_START + 63) #define EL_MM_WOODEN_WALL_END EL_MM_WALL_31 #define EL_MM_WALL_32 (EL_MM_START + 64) #define EL_MM_ICE_WALL_START EL_MM_WALL_32 +#define EL_MM_ICE_WALL_1 EL_MM_ICE_WALL_START #define EL_MM_WALL_47 (EL_MM_START + 79) #define EL_MM_ICE_WALL_END EL_MM_WALL_47 #define EL_MM_WALL_48 (EL_MM_START + 80) #define EL_MM_AMOEBA_WALL_START EL_MM_WALL_48 +#define EL_MM_AMOEBA_WALL_1 EL_MM_AMOEBA_WALL_START #define EL_MM_WALL_63 (EL_MM_START + 95) #define EL_MM_AMOEBA_WALL_END EL_MM_WALL_63 #define EL_MM_WALL_END EL_MM_WALL_63 @@ -1711,9 +1715,11 @@ #define EL_DF_STEEL_GRID_FIXED_END EL_DF_STEEL_GRID_FIXED_07 #define EL_DF_WOODEN_WALL_START (EL_DF_START2 + 272) +#define EL_DF_WOODEN_WALL_1 (EL_DF_WOODEN_WALL_START + 0) #define EL_DF_WOODEN_WALL_END (EL_DF_WOODEN_WALL_START + 15) #define EL_DF_STEEL_WALL_START (EL_DF_START2 + 288) +#define EL_DF_STEEL_WALL_1 (EL_DF_STEEL_WALL_START + 0) #define EL_DF_STEEL_WALL_END (EL_DF_STEEL_WALL_START + 15) #define EL_DF_WALL_START EL_DF_WOODEN_WALL_START @@ -2161,73 +2167,74 @@ #define ACTION_EATING 49 #define ACTION_TWINKLING 50 #define ACTION_SPLASHING 51 -#define ACTION_PAGE_1 52 -#define ACTION_PAGE_2 53 -#define ACTION_PAGE_3 54 -#define ACTION_PAGE_4 55 -#define ACTION_PAGE_5 56 -#define ACTION_PAGE_6 57 -#define ACTION_PAGE_7 58 -#define ACTION_PAGE_8 59 -#define ACTION_PAGE_9 60 -#define ACTION_PAGE_10 61 -#define ACTION_PAGE_11 62 -#define ACTION_PAGE_12 63 -#define ACTION_PAGE_13 64 -#define ACTION_PAGE_14 65 -#define ACTION_PAGE_15 66 -#define ACTION_PAGE_16 67 -#define ACTION_PAGE_17 68 -#define ACTION_PAGE_18 69 -#define ACTION_PAGE_19 70 -#define ACTION_PAGE_20 71 -#define ACTION_PAGE_21 72 -#define ACTION_PAGE_22 73 -#define ACTION_PAGE_23 74 -#define ACTION_PAGE_24 75 -#define ACTION_PAGE_25 76 -#define ACTION_PAGE_26 77 -#define ACTION_PAGE_27 78 -#define ACTION_PAGE_28 79 -#define ACTION_PAGE_29 80 -#define ACTION_PAGE_30 81 -#define ACTION_PAGE_31 82 -#define ACTION_PAGE_32 83 -#define ACTION_PART_1 84 -#define ACTION_PART_2 85 -#define ACTION_PART_3 86 -#define ACTION_PART_4 87 -#define ACTION_PART_5 88 -#define ACTION_PART_6 89 -#define ACTION_PART_7 90 -#define ACTION_PART_8 91 -#define ACTION_PART_9 92 -#define ACTION_PART_10 93 -#define ACTION_PART_11 94 -#define ACTION_PART_12 95 -#define ACTION_PART_13 96 -#define ACTION_PART_14 97 -#define ACTION_PART_15 98 -#define ACTION_PART_16 99 -#define ACTION_PART_17 100 -#define ACTION_PART_18 101 -#define ACTION_PART_19 102 -#define ACTION_PART_20 103 -#define ACTION_PART_21 104 -#define ACTION_PART_22 105 -#define ACTION_PART_23 106 -#define ACTION_PART_24 107 -#define ACTION_PART_25 108 -#define ACTION_PART_26 109 -#define ACTION_PART_27 110 -#define ACTION_PART_28 111 -#define ACTION_PART_29 112 -#define ACTION_PART_30 113 -#define ACTION_PART_31 114 -#define ACTION_PART_32 115 -#define ACTION_OTHER 116 - -#define NUM_ACTIONS 117 +#define ACTION_HITTING 52 +#define ACTION_PAGE_1 53 +#define ACTION_PAGE_2 54 +#define ACTION_PAGE_3 55 +#define ACTION_PAGE_4 56 +#define ACTION_PAGE_5 57 +#define ACTION_PAGE_6 58 +#define ACTION_PAGE_7 59 +#define ACTION_PAGE_8 60 +#define ACTION_PAGE_9 61 +#define ACTION_PAGE_10 62 +#define ACTION_PAGE_11 63 +#define ACTION_PAGE_12 64 +#define ACTION_PAGE_13 65 +#define ACTION_PAGE_14 66 +#define ACTION_PAGE_15 67 +#define ACTION_PAGE_16 68 +#define ACTION_PAGE_17 69 +#define ACTION_PAGE_18 70 +#define ACTION_PAGE_19 71 +#define ACTION_PAGE_20 72 +#define ACTION_PAGE_21 73 +#define ACTION_PAGE_22 74 +#define ACTION_PAGE_23 75 +#define ACTION_PAGE_24 76 +#define ACTION_PAGE_25 77 +#define ACTION_PAGE_26 78 +#define ACTION_PAGE_27 79 +#define ACTION_PAGE_28 80 +#define ACTION_PAGE_29 81 +#define ACTION_PAGE_30 82 +#define ACTION_PAGE_31 83 +#define ACTION_PAGE_32 84 +#define ACTION_PART_1 85 +#define ACTION_PART_2 86 +#define ACTION_PART_3 87 +#define ACTION_PART_4 88 +#define ACTION_PART_5 89 +#define ACTION_PART_6 90 +#define ACTION_PART_7 91 +#define ACTION_PART_8 92 +#define ACTION_PART_9 93 +#define ACTION_PART_10 94 +#define ACTION_PART_11 95 +#define ACTION_PART_12 96 +#define ACTION_PART_13 97 +#define ACTION_PART_14 98 +#define ACTION_PART_15 99 +#define ACTION_PART_16 100 +#define ACTION_PART_17 101 +#define ACTION_PART_18 102 +#define ACTION_PART_19 103 +#define ACTION_PART_20 104 +#define ACTION_PART_21 105 +#define ACTION_PART_22 106 +#define ACTION_PART_23 107 +#define ACTION_PART_24 108 +#define ACTION_PART_25 109 +#define ACTION_PART_26 110 +#define ACTION_PART_27 111 +#define ACTION_PART_28 112 +#define ACTION_PART_29 113 +#define ACTION_PART_30 114 +#define ACTION_PART_31 115 +#define ACTION_PART_32 116 +#define ACTION_OTHER 117 + +#define NUM_ACTIONS 118 #define ACTION_BORING_LAST ACTION_BORING_10 #define ACTION_SLEEPING_LAST ACTION_SLEEPING_3