rnd-20060606-1-src

* fixed bug with displaying any player as "yellow" when moving into acid

diff --git a/ChangeLog b/ChangeLog
index fbbf09c9cb0602cc1cd33dbb83e38c79fbff28be..c07604be8a7163d3c1e742bf5a74b1027b9a685f 100644 (file)
--- 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 183e04a9b641b35eebb1c68cdb0fcd0354022e57..4df6b8bb2252cac8f7c7e99d5b5ca53f36ed9301 100644 (file)
--- 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 0395afae669525f711ececc669caacf1678cf3a4..5631595e6b59c70f5fbaf5f13ad59e0e27606da1 100644 (file)
--- 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 7cf63d089f34368823121b951f2c736b1cea5fb7..ac37d91eb997b8f8f9097c144c23d8a00fdc817b 100644 (file)
--- 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);