From: Holger Schemel <info@artsoft.org>
Date: Mon, 5 Jun 2006 22:35:49 +0000 (+0200)
Subject: rnd-20060606-1-src
X-Git-Tag: 3.2.0^2~7
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=64d0700c316f0c9dee9730c93ad2b13785b3dad4;p=rocksndiamonds.git

rnd-20060606-1-src
* fixed bug with displaying any player as "yellow" when moving into acid
---

diff --git a/ChangeLog b/ChangeLog
index fbbf09c9..c07604be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2006-06-06
+	* fixed bug with displaying any player as "yellow" when moving into acid
+
 2006-06-03
 	* fixed bug with player exploding when moving into acid
 	* fixed bug with level settings being reset in editor and when playing
diff --git a/src/conftime.h b/src/conftime.h
index 183e04a9..4df6b8bb 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2006-06-04 01:42]"
+#define COMPILE_DATE_STRING "[2006-06-06 00:32]"
diff --git a/src/files.c b/src/files.c
index 0395afae..5631595e 100644
--- a/src/files.c
+++ b/src/files.c
@@ -227,8 +227,8 @@ static struct LevelFileConfigInfo chunk_config_INFO[] =
   {
     -1,					-1,
     -1,					-1,
-    NULL,				-1,
-  },
+    NULL,				-1
+  }
 };
 
 static struct LevelFileConfigInfo chunk_config_ELEM[] =
@@ -722,8 +722,8 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] =
   {
     -1,					-1,
     -1,					-1,
-    NULL,				-1,
-  },
+    NULL,				-1
+  }
 };
 
 static struct LevelFileConfigInfo chunk_config_NOTE[] =
@@ -750,8 +750,8 @@ static struct LevelFileConfigInfo chunk_config_NOTE[] =
   {
     -1,					-1,
     -1,					-1,
-    NULL,				-1,
-  },
+    NULL,				-1
+  }
 };
 
 static struct LevelFileConfigInfo chunk_config_CUSX_base[] =
@@ -956,7 +956,7 @@ static struct LevelFileConfigInfo chunk_config_CUSX_base[] =
     -1,					-1,
     NULL,				-1,
     NULL
-  },
+  }
 };
 
 static struct LevelFileConfigInfo chunk_config_CUSX_change[] =
@@ -1094,8 +1094,8 @@ static struct LevelFileConfigInfo chunk_config_CUSX_change[] =
   {
     -1,					-1,
     -1,					-1,
-    NULL,				-1,
-  },
+    NULL,				-1
+  }
 };
 
 static struct LevelFileConfigInfo chunk_config_GRPX[] =
@@ -1135,8 +1135,8 @@ static struct LevelFileConfigInfo chunk_config_GRPX[] =
   {
     -1,					-1,
     -1,					-1,
-    NULL,				-1,
-  },
+    NULL,				-1
+  }
 };
 
 static struct LevelFileConfigInfo chunk_config_CONF[] =		/* (OBSOLETE) */
@@ -1190,8 +1190,8 @@ static struct LevelFileConfigInfo chunk_config_CONF[] =		/* (OBSOLETE) */
   {
     -1,					-1,
     -1,					-1,
-    NULL,				-1,
-  },
+    NULL,				-1
+  }
 };
 
 static struct
diff --git a/src/game.c b/src/game.c
index 7cf63d08..ac37d91e 100644
--- a/src/game.c
+++ b/src/game.c
@@ -11732,7 +11732,11 @@ int DigField(struct PlayerInfo *player,
   if (player_can_move && element == EL_ACID && move_direction == MV_DOWN)
   {
     SplashAcid(x, y);
+#if 1
+    Feld[jx][jy] = player->artwork_element;
+#else
     Feld[jx][jy] = EL_PLAYER_1;
+#endif
     InitMovingField(jx, jy, MV_DOWN);
     Store[jx][jy] = EL_ACID;
     ContinueMoving(jx, jy);