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,
 
-#if RELEASE_311
+#if RELEASE_312
   EL_EMPTY,
 #else
   EL_EMC_ANDROID,
 #endif
   EL_BALLOON,
   EL_BALLOON_SWITCH_ANY,
-#if RELEASE_311
+#if RELEASE_312
   EL_EMPTY,
 #else
   EL_BALLOON_SWITCH_NONE,
@@ -2788,7 +2788,7 @@ static int editor_el_emerald_mine_club[] =
 
   EL_EMC_GRASS,
   EL_EMC_PLANT,
-#if RELEASE_311
+#if RELEASE_312
   EL_EMPTY,
   EL_EMPTY,
 #else
@@ -2796,7 +2796,7 @@ static int editor_el_emerald_mine_club[] =
   EL_EMC_MAGNIFIER,
 #endif
 
-#if RELEASE_311
+#if RELEASE_312
   EL_EMPTY,
   EL_EMPTY,
 #else
@@ -2804,13 +2804,13 @@ static int editor_el_emerald_mine_club[] =
   EL_EMC_MAGIC_BALL_SWITCH,
 #endif
   EL_SPRING,
-#if RELEASE_311
+#if RELEASE_312
   EL_EMPTY,
 #else
   EL_EMC_SPRING_BUMPER,
 #endif
 
-#if RELEASE_311
+#if RELEASE_312
   EL_EMPTY,
 #else
   EL_EMC_DRIPPER,