projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed redundant code
[rocksndiamonds.git]
/
src
/
main.h
diff --git
a/src/main.h
b/src/main.h
index dce9139ec9b84487841d15884bb85f30dd5b1fb9..063ce800dd5f6bf6cb6c6c9e5dece794218336d0 100644
(file)
--- a/
src/main.h
+++ b/
src/main.h
@@
-965,6
+965,9
@@
(e) == EL_BD_CONVEYOR_DIR_SWITCH || \
(e) == EL_BD_CONVEYOR_DIR_SWITCH_ACTIVE)
(e) == EL_BD_CONVEYOR_DIR_SWITCH || \
(e) == EL_BD_CONVEYOR_DIR_SWITCH_ACTIVE)
+#define IS_BD_RUNTIME_ELEMENT(e) ((e) >= EL_BD_RUNTIME_START && \
+ (e) <= EL_BD_RUNTIME_END)
+
#define IS_SOKOBAN_OBJECT_OR_FIELD(e) ((e) == EL_SOKOBAN_OBJECT || \
(e) == EL_SOKOBAN_FIELD_EMPTY || \
(e) == EL_SOKOBAN_FIELD_FULL)
#define IS_SOKOBAN_OBJECT_OR_FIELD(e) ((e) == EL_SOKOBAN_OBJECT || \
(e) == EL_SOKOBAN_FIELD_EMPTY || \
(e) == EL_SOKOBAN_FIELD_FULL)
@@
-2064,7
+2067,8
@@
#define EL_DF_END_2 EL_DF_SLOPE_END
// BD style elements (normal)
#define EL_DF_END_2 EL_DF_SLOPE_END
// BD style elements (normal)
-#define EL_BD_EMPTY_SPACE 1253
+#define EL_BD_START 1253
+#define EL_BD_EMPTY_SPACE EL_BD_START
#define EL_BD_EMPTY EL_BD_EMPTY_SPACE
#define EL_BD_SAND 1254
#define EL_BD_SAND_2 1255
#define EL_BD_EMPTY EL_BD_EMPTY_SPACE
#define EL_BD_SAND 1254
#define EL_BD_SAND_2 1255
@@
-2301,6
+2305,10
@@
#define EL_BD_NUT_BREAKING_2 1484
#define EL_BD_NUT_BREAKING_3 1485
#define EL_BD_NUT_BREAKING_4 1486
#define EL_BD_NUT_BREAKING_2 1484
#define EL_BD_NUT_BREAKING_3 1485
#define EL_BD_NUT_BREAKING_4 1486
+#define EL_BD_END EL_BD_NUT_BREAKING_4
+
+#define EL_BD_RUNTIME_START EL_BD_SAND_BALL_FALLING
+#define EL_BD_RUNTIME_END EL_BD_NUT_BREAKING_4
#define NUM_FILE_ELEMENTS 1487
#define NUM_FILE_ELEMENTS 1487
@@
-2743,6
+2751,7
@@
enum
GFX_SPECIAL_ARG_SETUP_SHORTCUTS_3,
GFX_SPECIAL_ARG_SETUP_SHORTCUTS_4,
GFX_SPECIAL_ARG_SETUP_SHORTCUTS_5,
GFX_SPECIAL_ARG_SETUP_SHORTCUTS_3,
GFX_SPECIAL_ARG_SETUP_SHORTCUTS_4,
GFX_SPECIAL_ARG_SETUP_SHORTCUTS_5,
+ GFX_SPECIAL_ARG_SETUP_SHORTCUTS_6,
GFX_SPECIAL_ARG_SETUP_CHOOSE_ARTWORK,
GFX_SPECIAL_ARG_SETUP_CHOOSE_OTHER,
GFX_SPECIAL_ARG_SETUP_CHOOSE_ARTWORK,
GFX_SPECIAL_ARG_SETUP_CHOOSE_OTHER,