From: Holger Schemel <info@artsoft.org>
Date: Wed, 31 Mar 2004 18:48:20 +0000 (+0200)
Subject: rnd-20040331-1-src
X-Git-Tag: 3.1.0^2~32
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=68a9e44b8005d2f3d63d8fae23ad998ee995789d;p=rocksndiamonds.git

rnd-20040331-1-src
---

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index db8957cc..f507f301 100644
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -3708,6 +3708,7 @@ struct ConfigInfo image_config[] =
   { "background.SCORES",			UNDEFINED_FILENAME	},
   { "background.EDITOR",			UNDEFINED_FILENAME	},
   { "background.INFO",				UNDEFINED_FILENAME	},
+  { "background.INFO[ELEMENTS]",		UNDEFINED_FILENAME	},
   { "background.SETUP",				UNDEFINED_FILENAME	},
   { "background.DOOR",				UNDEFINED_FILENAME	},
 
diff --git a/src/conf_gfx.h b/src/conf_gfx.h
index 67ec08c2..1462907b 100644
--- a/src/conf_gfx.h
+++ b/src/conf_gfx.h
@@ -1401,9 +1401,10 @@
 #define IMG_BACKGROUND_SCORES				1380
 #define IMG_BACKGROUND_EDITOR				1381
 #define IMG_BACKGROUND_INFO				1382
-#define IMG_BACKGROUND_SETUP				1383
-#define IMG_BACKGROUND_DOOR				1384
+#define IMG_BACKGROUND_INFO_ELEMENTS			1383
+#define IMG_BACKGROUND_SETUP				1384
+#define IMG_BACKGROUND_DOOR				1385
 
-#define NUM_IMAGE_FILES					1385
+#define NUM_IMAGE_FILES					1386
 
 #endif	/* CONF_GFX_H */
diff --git a/src/conftime.h b/src/conftime.h
index e0478752..5e3880c4 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2004-03-26 10:44]"
+#define COMPILE_DATE_STRING "[2004-03-31 09:43]"
diff --git a/src/game.c b/src/game.c
index b1254556..8680f345 100644
--- a/src/game.c
+++ b/src/game.c
@@ -9363,22 +9363,23 @@ void ScrollPlayer(struct PlayerInfo *player, int mode)
       int old_jy = last_jy;
 
 #if 1
-      CheckTriggeredElementChangePlayer(old_jx, old_jy, Feld[old_jx][old_jy],
-					CE_OTHER_GETS_LEFT,
-					player->index_bit, leave_side);
-
+      /* !!! TEST ONLY !!! */
       if (IS_CUSTOM_ELEMENT(Feld[old_jx][old_jy]))
 	CheckElementChangePlayer(old_jx, old_jy, Feld[old_jx][old_jy],
 				 CE_LEFT_BY_PLAYER,
 				 player->index_bit, leave_side);
 
-      CheckTriggeredElementChangePlayer(jx, jy, Feld[jx][jy],
-					CE_OTHER_GETS_ENTERED,
-					player->index_bit, enter_side);
+      CheckTriggeredElementChangePlayer(old_jx, old_jy, Feld[old_jx][old_jy],
+					CE_OTHER_GETS_LEFT,
+					player->index_bit, leave_side);
 
       if (IS_CUSTOM_ELEMENT(Feld[jx][jy]))
 	CheckElementChangePlayer(jx, jy, Feld[jx][jy], CE_ENTERED_BY_PLAYER,
 				 player->index_bit, enter_side);
+
+      CheckTriggeredElementChangePlayer(jx, jy, Feld[jx][jy],
+					CE_OTHER_GETS_ENTERED,
+					player->index_bit, enter_side);
 #endif
 
     }
@@ -9517,11 +9518,20 @@ void TestIfPlayerTouchesCustomElement(int x, int y)
       else
 	continue;		/* center and border element do not touch */
 
+#if 1
+      /* !!! TEST ONLY !!! */
+      CheckElementChangePlayer(xx, yy, border_element, CE_TOUCHED_BY_PLAYER,
+			       player->index_bit, border_side);
+      CheckTriggeredElementChangePlayer(xx, yy, border_element,
+					CE_OTHER_GETS_TOUCHED,
+					player->index_bit, border_side);
+#else
       CheckTriggeredElementChangePlayer(xx, yy, border_element,
 					CE_OTHER_GETS_TOUCHED,
 					player->index_bit, border_side);
       CheckElementChangePlayer(xx, yy, border_element, CE_TOUCHED_BY_PLAYER,
 			       player->index_bit, border_side);
+#endif
     }
     else if (IS_PLAYER(xx, yy))
     {
@@ -9533,11 +9543,20 @@ void TestIfPlayerTouchesCustomElement(int x, int y)
 	  continue;		/* center and border element do not touch */
       }
 
+#if 1
+      /* !!! TEST ONLY !!! */
+      CheckElementChangePlayer(x, y, center_element, CE_TOUCHED_BY_PLAYER,
+			       player->index_bit, center_side);
+      CheckTriggeredElementChangePlayer(x, y, center_element,
+					CE_OTHER_GETS_TOUCHED,
+					player->index_bit, center_side);
+#else
       CheckTriggeredElementChangePlayer(x, y, center_element,
 					CE_OTHER_GETS_TOUCHED,
 					player->index_bit, center_side);
       CheckElementChangePlayer(x, y, center_element, CE_TOUCHED_BY_PLAYER,
 			       player->index_bit, center_side);
+#endif
 
       break;
     }
@@ -10816,10 +10835,18 @@ int DigField(struct PlayerInfo *player,
 	else
 	  player->push_delay_value = -1;	/* get new value later */
 
+#if 1
+      /* !!! TEST ONLY !!! */
+	CheckElementChangePlayer(x, y, element, CE_PUSHED_BY_PLAYER,
+				 player->index_bit, dig_side);
+	CheckTriggeredElementChangePlayer(x, y, element, CE_OTHER_GETS_PUSHED,
+					  player->index_bit, dig_side);
+#else
 	CheckTriggeredElementChangePlayer(x, y, element, CE_OTHER_GETS_PUSHED,
 					  player->index_bit, dig_side);
 	CheckElementChangePlayer(x, y, element, CE_PUSHED_BY_PLAYER,
 				 player->index_bit, dig_side);
+#endif
 
 	break;
       }
@@ -10923,17 +10950,34 @@ int DigField(struct PlayerInfo *player,
 	  player->switch_x = x;
 	  player->switch_y = y;
 
+#if 1
+	  /* !!! TEST ONLY !!! */
+	  CheckElementChangePlayer(x, y, element, CE_SWITCHED,
+				   player->index_bit, dig_side);
+	  CheckTriggeredElementChangePlayer(x, y, element,
+					    CE_OTHER_IS_SWITCHING,
+					    player->index_bit, dig_side);
+#else
 	  CheckTriggeredElementChangePlayer(x, y, element,
 					    CE_OTHER_IS_SWITCHING,
 					    player->index_bit, dig_side);
 	  CheckElementChangePlayer(x, y, element, CE_SWITCHED,
 				   player->index_bit, dig_side);
+#endif
 	}
 
+#if 1
+	/* !!! TEST ONLY !!! */
+	CheckElementChangePlayer(x, y, element, CE_PRESSED_BY_PLAYER,
+				 player->index_bit, dig_side);
+	CheckTriggeredElementChangePlayer(x, y, element, CE_OTHER_GETS_PRESSED,
+					  player->index_bit, dig_side);
+#else
 	CheckTriggeredElementChangePlayer(x, y, element, CE_OTHER_GETS_PRESSED,
 					  player->index_bit, dig_side);
 	CheckElementChangePlayer(x, y, element, CE_PRESSED_BY_PLAYER,
 				 player->index_bit, dig_side);
+#endif
       }
 
       return MF_NO_ACTION;