rnd-20100224-1-src

[rocksndiamonds.git] / src / init.c

diff --git a/src/init.c b/src/init.c
index c3c14af2e682f984e3034b7a011c12c363f24e59..abef35e1a92821bb291d387ccc9bafde0dfe30eb 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -329,7 +329,7 @@ void SetBitmaps_EM(Bitmap **em_bitmap)
 }
 #endif
 
-#if 1
+#if 0
 /* !!! FIX THIS (CHANGE TO USING NORMAL ELEMENT GRAPHIC DEFINITIONS) !!! */
 void SetBitmaps_SP(Bitmap **sp_bitmap)
 {
@@ -2837,8 +2837,12 @@ void InitElementPropertiesStatic()
     EL_SIGN_FRANKIE,
     EL_STEEL_EXIT_CLOSED,
     EL_STEEL_EXIT_OPEN,
+    EL_STEEL_EXIT_OPENING,
+    EL_STEEL_EXIT_CLOSING,
     EL_EM_STEEL_EXIT_CLOSED,
     EL_EM_STEEL_EXIT_OPEN,
+    EL_EM_STEEL_EXIT_OPENING,
+    EL_EM_STEEL_EXIT_CLOSING,
     EL_DC_STEELWALL_1_LEFT,
     EL_DC_STEELWALL_1_RIGHT,
     EL_DC_STEELWALL_1_TOP,
@@ -4182,6 +4186,7 @@ void InitElementPropertiesStatic()
     EL_PLAYER_2,
     EL_PLAYER_3,
     EL_PLAYER_4,
+    EL_SOKOBAN_FIELD_PLAYER,
     EL_SP_MURPHY,
     EL_YAMYAM,
     EL_YAMYAM_LEFT,
@@ -5192,15 +5197,13 @@ void Execute_Command(char *command)
        str_ptr++;
     }
   }
-  else if (strPrefix(command, "convert ") ||
-          strPrefix(command, "convert_special_1 "))
+  else if (strPrefix(command, "convert "))
   {
-    char *str_copy = getStringCopy(&command[8]);
+    char *str_copy = getStringCopy(strchr(command, ' ') + 1);
     char *str_ptr = strchr(str_copy, ' ');
 
     global.convert_leveldir = str_copy;
     global.convert_level_nr = -1;
-    global.convert_mode_special_1 = strPrefix(command, "convert_special_1 ");
 
     if (str_ptr != NULL)                       /* level number follows */
     {