From: Holger Schemel <info@artsoft.org>
Date: Wed, 22 Jan 2020 12:46:31 +0000 (+0100)
Subject: fixed some pre-processor defines in EM engine source file
X-Git-Tag: 4.2.0.0~182
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=62ae579a20825069119e82a304d616fcaaccf59a;p=rocksndiamonds.git

fixed some pre-processor defines in EM engine source file
---

diff --git a/src/game_em/synchro_1.c b/src/game_em/synchro_1.c
index 08a823a0..dc713938 100644
--- a/src/game_em/synchro_1.c
+++ b/src/game_em/synchro_1.c
@@ -173,7 +173,7 @@ static boolean player_killed(struct PLAYER *ply)
     case Xdynamite_2:
     case Xdynamite_3:
     case Xdynamite_4:
-#if 1
+#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -490,7 +490,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
       case Xacid_splash_w:
 	Cave[y][x] = Zplayer;
 	Next[y][x] = Zplayer;
-#if 1
+#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
       case Xfake_acid_1:
       case Xfake_acid_2:
       case Xfake_acid_3:
diff --git a/src/game_em/synchro_2.c b/src/game_em/synchro_2.c
index eb202c7c..2d5aa926 100644
--- a/src/game_em/synchro_2.c
+++ b/src/game_em/synchro_2.c
@@ -2481,7 +2481,7 @@ static void Lstone(int x, int y)
     case Xacid_splash_w:
     case Xplant:
     case Yplant:
-#if 1
+#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -2617,7 +2617,7 @@ static void Lstone_pause(int x, int y)
     case Xblank:
     case Xacid_splash_e:
     case Xacid_splash_w:
-#if 1
+#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -2665,7 +2665,7 @@ static void Lstone_fall(int x, int y)
     case Xacid_splash_e:
     case Xacid_splash_w:
     case Zplayer:
-#if 1
+#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
     case Xfake_acid_1:
     case Xfake_acid_2:
     case Xfake_acid_3:
@@ -4635,7 +4635,7 @@ static void Lsand_stonesand_4(int x, int y)
   Next[y][x] = Xsand;
 }
 
-#if 1
+#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
 static void Lsand_stonesand_quickout_1(int x, int y)
 {
   Next[y][x] = Xsand_stonesand_quickout_2;
@@ -4792,6 +4792,7 @@ static void Lacid_8(int x, int y)
   Next[y][x] = Xacid_1;
 }
 
+#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
 static void Lfake_acid_1(int x, int y)
 {
   Next[y][x] = Xfake_acid_2;
@@ -4831,6 +4832,7 @@ static void Lfake_acid_8(int x, int y)
 {
   Next[y][x] = Xfake_acid_1;
 }
+#endif
 
 static void Lpause(int x, int y)
 {
@@ -4998,6 +5000,7 @@ void synchro_2(void)
     case Xacid_7:		Lacid_7(x, y);			goto loop;
     case Xacid_8:		Lacid_8(x, y);			goto loop;
 
+#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
     case Xfake_acid_1:		Lfake_acid_1(x, y);		goto loop;
     case Xfake_acid_2:		Lfake_acid_2(x, y);		goto loop;
     case Xfake_acid_3:		Lfake_acid_3(x, y);		goto loop;
@@ -5006,6 +5009,7 @@ void synchro_2(void)
     case Xfake_acid_6:		Lfake_acid_6(x, y);		goto loop;
     case Xfake_acid_7:		Lfake_acid_7(x, y);		goto loop;
     case Xfake_acid_8:		Lfake_acid_8(x, y);		goto loop;
+#endif
 
     case Xandroid:		Landroid(x, y);			goto loop;
     case Xandroid_1_n:		Landroid_1_n(x, y);		goto loop;
@@ -5131,7 +5135,7 @@ void synchro_2(void)
     case Xsand_stonesand_4:	Lsand_stonesand_4(x, y);	goto loop;
     case Xsand_stoneout_1:	Lsand_stoneout_1(x, y);		goto loop;
     case Xsand_stoneout_2:	Lsand_stoneout_2(x, y);		goto loop;
-#if 1
+#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
     case Xsand_stonesand_quickout_1:Lsand_stonesand_quickout_1(x, y);goto loop;
     case Xsand_stonesand_quickout_2:Lsand_stonesand_quickout_2(x, y);goto loop;
 #endif
@@ -5166,10 +5170,6 @@ void synchro_2(void)
       goto loop;
   }
 
-#undef RANDOM
-#undef PLAY
-#undef PLAY_FORCE
-
  done:
 
   if (ply[0].alive || ply[1].alive || ply[2].alive || ply[3].alive)