projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into releases
[rocksndiamonds.git]
/
src
/
editor.c
diff --git
a/src/editor.c
b/src/editor.c
index f4b017cc724e5385409ac8d2a990833d57e8518b..8c1302cc0232b150bc5c004b6bccd13bbd16df36 100644
(file)
--- a/
src/editor.c
+++ b/
src/editor.c
@@
-2768,14
+2768,14
@@
static int editor_el_emerald_mine_club[] =
EL_EMC_WALL_11,
EL_EMC_WALL_12,
EL_EMC_WALL_11,
EL_EMC_WALL_12,
-#if RELEASE_31
1
+#if RELEASE_31
2
EL_EMPTY,
#else
EL_EMC_ANDROID,
#endif
EL_BALLOON,
EL_BALLOON_SWITCH_ANY,
EL_EMPTY,
#else
EL_EMC_ANDROID,
#endif
EL_BALLOON,
EL_BALLOON_SWITCH_ANY,
-#if RELEASE_31
1
+#if RELEASE_31
2
EL_EMPTY,
#else
EL_BALLOON_SWITCH_NONE,
EL_EMPTY,
#else
EL_BALLOON_SWITCH_NONE,
@@
-2788,7
+2788,7
@@
static int editor_el_emerald_mine_club[] =
EL_EMC_GRASS,
EL_EMC_PLANT,
EL_EMC_GRASS,
EL_EMC_PLANT,
-#if RELEASE_31
1
+#if RELEASE_31
2
EL_EMPTY,
EL_EMPTY,
#else
EL_EMPTY,
EL_EMPTY,
#else
@@
-2796,7
+2796,7
@@
static int editor_el_emerald_mine_club[] =
EL_EMC_MAGNIFIER,
#endif
EL_EMC_MAGNIFIER,
#endif
-#if RELEASE_31
1
+#if RELEASE_31
2
EL_EMPTY,
EL_EMPTY,
#else
EL_EMPTY,
EL_EMPTY,
#else
@@
-2804,13
+2804,13
@@
static int editor_el_emerald_mine_club[] =
EL_EMC_MAGIC_BALL_SWITCH,
#endif
EL_SPRING,
EL_EMC_MAGIC_BALL_SWITCH,
#endif
EL_SPRING,
-#if RELEASE_31
1
+#if RELEASE_31
2
EL_EMPTY,
#else
EL_EMC_SPRING_BUMPER,
#endif
EL_EMPTY,
#else
EL_EMC_SPRING_BUMPER,
#endif
-#if RELEASE_31
1
+#if RELEASE_31
2
EL_EMPTY,
#else
EL_EMC_DRIPPER,
EL_EMPTY,
#else
EL_EMC_DRIPPER,