projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20060111-1-src
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index 6b00cb9077bd8a7b1119e36c58d3e2882bb0c381..708ab4a67d66058c99945acf9cc43733631e2b0e 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-1681,7
+1681,7
@@
static int get_special_property_bit(int element, int property_bit_nr)
{ EL_SP_MURPHY, 0 },
{ EL_SOKOBAN_FIELD_PLAYER, 0 },
{ EL_SP_MURPHY, 0 },
{ EL_SOKOBAN_FIELD_PLAYER, 0 },
- /* all element that can move may be able to also move into acid */
+ /* all element
s
that can move may be able to also move into acid */
{ EL_BUG, 1 },
{ EL_BUG_LEFT, 1 },
{ EL_BUG_RIGHT, 1 },
{ EL_BUG, 1 },
{ EL_BUG_LEFT, 1 },
{ EL_BUG_RIGHT, 1 },
@@
-1723,6
+1723,7
@@
static int get_special_property_bit(int element, int property_bit_nr)
{ EL_SP_ELECTRON, 15 },
{ EL_BALLOON, 16 },
{ EL_SPRING, 17 },
{ EL_SP_ELECTRON, 15 },
{ EL_BALLOON, 16 },
{ EL_SPRING, 17 },
+ { EL_EMC_ANDROID, 18 },
{ -1, -1 },
};
{ -1, -1 },
};
@@
-1809,6
+1810,7
@@
void InitElementPropertiesStatic()
EL_SP_BUGGY_BASE_ACTIVE,
EL_EMC_PLANT,
#endif
EL_SP_BUGGY_BASE_ACTIVE,
EL_EMC_PLANT,
#endif
+
-1
};
-1
};
@@
-1851,6
+1853,7
@@
void InitElementPropertiesStatic()
EL_SPEED_PILL,
EL_EMC_LENSES,
EL_EMC_MAGNIFIER,
EL_SPEED_PILL,
EL_EMC_LENSES,
EL_EMC_MAGNIFIER,
+
-1
};
-1
};
@@
-1881,6
+1884,7
@@
void InitElementPropertiesStatic()
EL_SP_BUGGY_BASE_ACTIVE,
EL_EMC_PLANT,
#endif
EL_SP_BUGGY_BASE_ACTIVE,
EL_EMC_PLANT,
#endif
+
-1
};
-1
};
@@
-1899,6
+1903,7
@@
void InitElementPropertiesStatic()
EL_PACMAN,
EL_SP_SNIKSNAK,
EL_SP_ELECTRON,
EL_PACMAN,
EL_SP_SNIKSNAK,
EL_SP_ELECTRON,
+
-1
};
-1
};
@@
-1908,6
+1913,7
@@
void InitElementPropertiesStatic()
EL_SPACESHIP,
EL_BD_BUTTERFLY,
EL_BD_FIREFLY,
EL_SPACESHIP,
EL_BD_BUTTERFLY,
EL_BD_FIREFLY,
+
-1
};
-1
};
@@
-2028,6
+2034,7
@@
void InitElementPropertiesStatic()
EL_TUBE_LEFT_DOWN,
EL_TUBE_RIGHT_UP,
EL_TUBE_RIGHT_DOWN,
EL_TUBE_LEFT_DOWN,
EL_TUBE_RIGHT_UP,
EL_TUBE_RIGHT_DOWN,
+
-1
};
-1
};
@@
-2069,6
+2076,9
@@
void InitElementPropertiesStatic()
EL_EMC_WALL_SLIPPERY_2,
EL_EMC_WALL_SLIPPERY_3,
EL_EMC_WALL_SLIPPERY_4,
EL_EMC_WALL_SLIPPERY_2,
EL_EMC_WALL_SLIPPERY_3,
EL_EMC_WALL_SLIPPERY_4,
+ EL_EMC_MAGIC_BALL,
+ EL_EMC_MAGIC_BALL_ACTIVE,
+
-1
};
-1
};
@@
-2098,6
+2108,7
@@
void InitElementPropertiesStatic()
EL_BALLOON,
EL_SPRING,
EL_EMC_ANDROID,
EL_BALLOON,
EL_SPRING,
EL_EMC_ANDROID,
+
-1
};
-1
};
@@
-2126,6
+2137,7
@@
void InitElementPropertiesStatic()
EL_CRYSTAL,
EL_SPRING,
EL_DX_SUPABOMB,
EL_CRYSTAL,
EL_SPRING,
EL_DX_SUPABOMB,
+
-1
};
-1
};
@@
-2151,6
+2163,7
@@
void InitElementPropertiesStatic()
EL_CRYSTAL,
EL_SPRING,
EL_DX_SUPABOMB,
EL_CRYSTAL,
EL_SPRING,
EL_DX_SUPABOMB,
+
-1
};
-1
};
@@
-2159,6
+2172,7
@@
void InitElementPropertiesStatic()
EL_ROCK,
EL_BD_ROCK,
EL_SP_ZONK,
EL_ROCK,
EL_BD_ROCK,
EL_SP_ZONK,
+
-1
};
-1
};
@@
-2167,6
+2181,7
@@
void InitElementPropertiesStatic()
EL_ROCK,
EL_BD_ROCK,
EL_SP_ZONK,
EL_ROCK,
EL_BD_ROCK,
EL_SP_ZONK,
+
-1
};
-1
};
@@
-2203,6
+2218,7
@@
void InitElementPropertiesStatic()
#if 0
EL_BLACK_ORB,
#endif
#if 0
EL_BLACK_ORB,
#endif
+
-1
};
-1
};
@@
-2218,6
+2234,7
@@
void InitElementPropertiesStatic()
EL_PIG,
EL_DRAGON,
EL_MOLE,
EL_PIG,
EL_DRAGON,
EL_MOLE,
+
-1
};
-1
};
@@
-2226,6
+2243,7
@@
void InitElementPropertiesStatic()
EL_BOMB,
EL_SP_DISK_ORANGE,
EL_DX_SUPABOMB,
EL_BOMB,
EL_SP_DISK_ORANGE,
EL_DX_SUPABOMB,
+
-1
};
-1
};
@@
-2252,6
+2270,7
@@
void InitElementPropertiesStatic()
EL_PENGUIN,
EL_PIG,
EL_DRAGON,
EL_PENGUIN,
EL_PIG,
EL_DRAGON,
+
-1
};
-1
};
@@
-2268,6
+2287,7
@@
void InitElementPropertiesStatic()
EL_TUBE_LEFT_DOWN,
EL_TUBE_RIGHT_UP,
EL_TUBE_RIGHT_DOWN,
EL_TUBE_LEFT_DOWN,
EL_TUBE_RIGHT_UP,
EL_TUBE_RIGHT_DOWN,
+
-1
};
-1
};
@@
-2304,6
+2324,7
@@
void InitElementPropertiesStatic()
EL_EMC_GATE_8_GRAY_ACTIVE,
EL_SWITCHGATE_OPEN,
EL_TIMEGATE_OPEN,
EL_EMC_GATE_8_GRAY_ACTIVE,
EL_SWITCHGATE_OPEN,
EL_TIMEGATE_OPEN,
+
-1
};
-1
};
@@
-2328,6
+2349,7
@@
void InitElementPropertiesStatic()
EL_SP_GRAVITY_OFF_PORT_RIGHT,
EL_SP_GRAVITY_OFF_PORT_UP,
EL_SP_GRAVITY_OFF_PORT_DOWN,
EL_SP_GRAVITY_OFF_PORT_RIGHT,
EL_SP_GRAVITY_OFF_PORT_UP,
EL_SP_GRAVITY_OFF_PORT_DOWN,
+
-1
};
-1
};
@@
-2363,6
+2385,7
@@
void InitElementPropertiesStatic()
EL_SP_DISK_YELLOW,
EL_BALLOON,
EL_EMC_ANDROID,
EL_SP_DISK_YELLOW,
EL_BALLOON,
EL_EMC_ANDROID,
+
-1
};
-1
};
@@
-2434,6
+2457,7
@@
void InitElementPropertiesStatic()
EL_SP_GRAVITY_OFF_PORT_RIGHT,
EL_SP_GRAVITY_OFF_PORT_UP,
EL_SP_GRAVITY_OFF_PORT_DOWN,
EL_SP_GRAVITY_OFF_PORT_RIGHT,
EL_SP_GRAVITY_OFF_PORT_UP,
EL_SP_GRAVITY_OFF_PORT_DOWN,
+
-1
};
-1
};
@@
-2475,6
+2499,7
@@
void InitElementPropertiesStatic()
/* elements that can explode only by explosion */
EL_BLACK_ORB,
/* elements that can explode only by explosion */
EL_BLACK_ORB,
+
-1
};
-1
};
@@
-2505,6
+2530,7
@@
void InitElementPropertiesStatic()
EL_SP_GRAVITY_OFF_PORT_UP,
EL_SP_GRAVITY_OFF_PORT_DOWN,
EL_EMC_GRASS,
EL_SP_GRAVITY_OFF_PORT_UP,
EL_SP_GRAVITY_OFF_PORT_DOWN,
EL_EMC_GRASS,
+
-1
};
-1
};
@@
-2517,6
+2543,7
@@
void InitElementPropertiesStatic()
EL_SP_MURPHY,
EL_SOKOBAN_FIELD_PLAYER,
EL_TRIGGER_PLAYER,
EL_SP_MURPHY,
EL_SOKOBAN_FIELD_PLAYER,
EL_TRIGGER_PLAYER,
+
-1
};
-1
};
@@
-2530,6
+2557,7
@@
void InitElementPropertiesStatic()
EL_EMERALD_RED,
EL_EMERALD_PURPLE,
EL_DIAMOND,
EL_EMERALD_RED,
EL_EMERALD_PURPLE,
EL_DIAMOND,
+
-1
};
-1
};
@@
-2563,6
+2591,8
@@
void InitElementPropertiesStatic()
EL_LAMP,
EL_TIME_ORB_FULL,
EL_EMC_MAGIC_BALL_SWITCH,
EL_LAMP,
EL_TIME_ORB_FULL,
EL_EMC_MAGIC_BALL_SWITCH,
+ EL_EMC_MAGIC_BALL_SWITCH_ACTIVE,
+
-1
};
-1
};
@@
-2596,6
+2626,7
@@
void InitElementPropertiesStatic()
EL_BD_AMOEBA,
EL_CHAR_QUESTION,
EL_UNKNOWN,
EL_BD_AMOEBA,
EL_CHAR_QUESTION,
EL_UNKNOWN,
+
-1
};
-1
};
@@
-2670,6
+2701,7
@@
void InitElementPropertiesStatic()
EL_SP_BUGGY_BASE_ACTIVE,
EL_SP_EXIT_OPENING,
EL_SP_EXIT_CLOSING,
EL_SP_BUGGY_BASE_ACTIVE,
EL_SP_EXIT_OPENING,
EL_SP_EXIT_CLOSING,
+
-1
};
-1
};
@@
-2686,6
+2718,7
@@
void InitElementPropertiesStatic()
EL_PLAYER_3,
EL_PLAYER_4,
EL_INVISIBLE_STEELWALL,
EL_PLAYER_3,
EL_PLAYER_4,
EL_INVISIBLE_STEELWALL,
+
-1
};
-1
};
@@
-2697,6
+2730,7
@@
void InitElementPropertiesStatic()
EL_EMERALD_RED,
EL_EMERALD_PURPLE,
EL_DIAMOND,
EL_EMERALD_RED,
EL_EMERALD_PURPLE,
EL_DIAMOND,
+
-1
};
-1
};
@@
-2724,6
+2758,7
@@
void InitElementPropertiesStatic()
EL_DIAMOND,
EL_PEARL,
EL_CRYSTAL,
EL_DIAMOND,
EL_PEARL,
EL_CRYSTAL,
+
-1
};
-1
};
@@
-2737,6
+2772,7
@@
void InitElementPropertiesStatic()
EL_DIAMOND,
EL_PEARL,
EL_CRYSTAL,
EL_DIAMOND,
EL_PEARL,
EL_CRYSTAL,
+
-1
};
-1
};
@@
-2748,6
+2784,7
@@
void InitElementPropertiesStatic()
EL_EMERALD_RED,
EL_EMERALD_PURPLE,
EL_DIAMOND,
EL_EMERALD_RED,
EL_EMERALD_PURPLE,
EL_DIAMOND,
+
-1
};
-1
};
@@
-2826,6
+2863,7
@@
void InitElementPropertiesStatic()
EL_EMC_WALL_6,
EL_EMC_WALL_7,
EL_EMC_WALL_8,
EL_EMC_WALL_6,
EL_EMC_WALL_7,
EL_EMC_WALL_8,
+
-1
};
-1
};
@@
-2989,6
+3027,7
@@
void InitElementPropertiesStatic()
EL_TUBE_LEFT_DOWN,
EL_TUBE_RIGHT_UP,
EL_TUBE_RIGHT_DOWN,
EL_TUBE_LEFT_DOWN,
EL_TUBE_RIGHT_UP,
EL_TUBE_RIGHT_DOWN,
+
-1
};
-1
};
@@
-3005,6
+3044,7
@@
void InitElementPropertiesStatic()
EL_PACMAN,
EL_SP_SNIKSNAK,
EL_SP_ELECTRON,
EL_PACMAN,
EL_SP_SNIKSNAK,
EL_SP_ELECTRON,
+
-1
};
-1
};
@@
-3022,6
+3062,7
@@
void InitElementPropertiesStatic()
EL_CONVEYOR_BELT_4_LEFT,
EL_CONVEYOR_BELT_4_MIDDLE,
EL_CONVEYOR_BELT_4_RIGHT,
EL_CONVEYOR_BELT_4_LEFT,
EL_CONVEYOR_BELT_4_MIDDLE,
EL_CONVEYOR_BELT_4_RIGHT,
+
-1
};
-1
};
@@
-3039,6
+3080,7
@@
void InitElementPropertiesStatic()
EL_CONVEYOR_BELT_4_LEFT_ACTIVE,
EL_CONVEYOR_BELT_4_MIDDLE_ACTIVE,
EL_CONVEYOR_BELT_4_RIGHT_ACTIVE,
EL_CONVEYOR_BELT_4_LEFT_ACTIVE,
EL_CONVEYOR_BELT_4_MIDDLE_ACTIVE,
EL_CONVEYOR_BELT_4_RIGHT_ACTIVE,
+
-1
};
-1
};
@@
-3056,6
+3098,7
@@
void InitElementPropertiesStatic()
EL_CONVEYOR_BELT_4_SWITCH_LEFT,
EL_CONVEYOR_BELT_4_SWITCH_MIDDLE,
EL_CONVEYOR_BELT_4_SWITCH_RIGHT,
EL_CONVEYOR_BELT_4_SWITCH_LEFT,
EL_CONVEYOR_BELT_4_SWITCH_MIDDLE,
EL_CONVEYOR_BELT_4_SWITCH_RIGHT,
+
-1
};
-1
};
@@
-3072,6
+3115,7
@@
void InitElementPropertiesStatic()
EL_TUBE_VERTICAL_LEFT,
EL_TUBE_VERTICAL_RIGHT,
EL_TUBE_ANY,
EL_TUBE_VERTICAL_LEFT,
EL_TUBE_VERTICAL_RIGHT,
EL_TUBE_ANY,
+
-1
};
-1
};
@@
-3113,6
+3157,7
@@
void InitElementPropertiesStatic()
EL_EMC_GATE_6_GRAY_ACTIVE,
EL_EMC_GATE_7_GRAY_ACTIVE,
EL_EMC_GATE_8_GRAY_ACTIVE,
EL_EMC_GATE_6_GRAY_ACTIVE,
EL_EMC_GATE_7_GRAY_ACTIVE,
EL_EMC_GATE_8_GRAY_ACTIVE,
+
-1
};
-1
};
@@
-3123,6
+3168,7
@@
void InitElementPropertiesStatic()
EL_AMOEBA_DRY,
EL_AMOEBA_FULL,
EL_BD_AMOEBA,
EL_AMOEBA_DRY,
EL_AMOEBA_FULL,
EL_BD_AMOEBA,
+
-1
};
-1
};
@@
-3132,10
+3178,11
@@
void InitElementPropertiesStatic()
EL_AMOEBA_DRY,
EL_AMOEBA_FULL,
EL_BD_AMOEBA,
EL_AMOEBA_DRY,
EL_AMOEBA_FULL,
EL_BD_AMOEBA,
+
-1
};
-1
};
- static int ep_has_content[] =
+ static int ep_has_
editor_
content[] =
{
EL_PLAYER_1,
EL_PLAYER_2,
{
EL_PLAYER_1,
EL_PLAYER_2,
@@
-3148,6
+3195,8
@@
void InitElementPropertiesStatic()
EL_AMOEBA_FULL,
EL_BD_AMOEBA,
EL_EMC_MAGIC_BALL,
EL_AMOEBA_FULL,
EL_BD_AMOEBA,
EL_EMC_MAGIC_BALL,
+ EL_EMC_ANDROID,
+
-1
};
-1
};
@@
-3166,6
+3215,7
@@
void InitElementPropertiesStatic()
EL_AMOEBA_FULL,
EL_GAME_OF_LIFE,
EL_BIOMAZE,
EL_AMOEBA_FULL,
EL_GAME_OF_LIFE,
EL_BIOMAZE,
+
-1
};
-1
};
@@
-3177,6
+3227,7
@@
void InitElementPropertiesStatic()
EL_DYNABOMB_PLAYER_3_ACTIVE,
EL_DYNABOMB_PLAYER_4_ACTIVE,
EL_SP_DISK_RED_ACTIVE,
EL_DYNABOMB_PLAYER_3_ACTIVE,
EL_DYNABOMB_PLAYER_4_ACTIVE,
EL_SP_DISK_RED_ACTIVE,
+
-1
};
-1
};
@@
-3361,6
+3412,7
@@
void InitElementPropertiesStatic()
EL_EMC_WALL_14,
EL_EMC_WALL_15,
EL_EMC_WALL_16,
EL_EMC_WALL_14,
EL_EMC_WALL_15,
EL_EMC_WALL_16,
+
-1
};
-1
};
@@
-3375,6
+3427,7
@@
void InitElementPropertiesStatic()
EL_LANDMINE,
EL_TRAP,
EL_TRAP_ACTIVE,
EL_LANDMINE,
EL_TRAP,
EL_TRAP_ACTIVE,
+
-1
};
-1
};
@@
-3394,6
+3447,7
@@
void InitElementPropertiesStatic()
EL_INTERNAL_CASCADE_USER_ACTIVE,
EL_INTERNAL_CASCADE_GENERIC_ACTIVE,
EL_INTERNAL_CASCADE_DYNAMIC_ACTIVE,
EL_INTERNAL_CASCADE_USER_ACTIVE,
EL_INTERNAL_CASCADE_GENERIC_ACTIVE,
EL_INTERNAL_CASCADE_DYNAMIC_ACTIVE,
+
-1
};
-1
};
@@
-3413,6
+3467,7
@@
void InitElementPropertiesStatic()
EL_INTERNAL_CASCADE_USER,
EL_INTERNAL_CASCADE_GENERIC,
EL_INTERNAL_CASCADE_DYNAMIC,
EL_INTERNAL_CASCADE_USER,
EL_INTERNAL_CASCADE_GENERIC,
EL_INTERNAL_CASCADE_DYNAMIC,
+
-1
};
-1
};
@@
-3473,7
+3528,7
@@
void InitElementPropertiesStatic()
{ ep_keygate, EP_KEYGATE },
{ ep_amoeboid, EP_AMOEBOID },
{ ep_amoebalive, EP_AMOEBALIVE },
{ ep_keygate, EP_KEYGATE },
{ ep_amoeboid, EP_AMOEBOID },
{ ep_amoebalive, EP_AMOEBALIVE },
- { ep_has_
content, EP_HAS_CONTENT
},
+ { ep_has_
editor_content, EP_HAS_EDITOR_CONTENT
},
{ ep_can_turn_each_move, EP_CAN_TURN_EACH_MOVE },
{ ep_can_grow, EP_CAN_GROW },
{ ep_active_bomb, EP_ACTIVE_BOMB },
{ ep_can_turn_each_move, EP_CAN_TURN_EACH_MOVE },
{ ep_can_grow, EP_CAN_GROW },
{ ep_active_bomb, EP_ACTIVE_BOMB },