rocksndiamonds-3.1.2

[rocksndiamonds.git] / src / init.c

diff --git a/src/init.c b/src/init.c
index 9fcad89120eb3b07cdc87a97a0ca64b5fc54f7e8..1f58073285447eaab1dac4f132d8be8288442f8c 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -3949,16 +3949,6 @@ void InitElementPropertiesEngine(int engine_version)
       if (element_info[i].change_page[j].can_change)
        SET_PROPERTY(i, EP_CAN_CHANGE, TRUE);
 
-    /* ---------- HAS_ACTION ----------------------------------------------- */
-    SET_PROPERTY(i, EP_HAS_ACTION, FALSE);     /* default: has no action */
-    for (j = 0; j < element_info[i].num_change_pages; j++)
-      if (element_info[i].change_page[j].has_action)
-       SET_PROPERTY(i, EP_HAS_ACTION, TRUE);
-
-    /* ---------- CAN_CHANGE_OR_HAS_ACTION --------------------------------- */
-    SET_PROPERTY(i, EP_CAN_CHANGE_OR_HAS_ACTION, (CAN_CHANGE(i) ||
-                                                 HAS_ACTION(i)));
-
     /* ---------- GFX_CRUMBLED --------------------------------------------- */
 #if 1
     SET_PROPERTY(i, EP_GFX_CRUMBLED,
@@ -4290,11 +4280,6 @@ static void InitSetup()
     options.verbose = TRUE;
 }
 
-static void InitGameInfo()
-{
-  game.restart_level = FALSE;
-}
-
 static void InitPlayerInfo()
 {
   int i;
@@ -4430,7 +4415,7 @@ static void InitArtworkConfig()
 
   for (i = 0; i < NUM_MUSIC_PREFIXES; i++)
     music_id_prefix[i] = music_prefix_info[i].prefix;
-  music_id_prefix[NUM_MUSIC_PREFIXES] = NULL;
+  music_id_prefix[MAX_LEVELS] = NULL;
 
   for (i = 0; i < NUM_ACTIONS; i++)
     action_id_suffix[i] = element_action_info[i].suffix;
@@ -4853,7 +4838,6 @@ void OpenAll()
 
   InitSetup();
 
-  InitGameInfo();
   InitPlayerInfo();
   InitArtworkInfo();           /* needed before loading gfx, sound & music */
   InitArtworkConfig();         /* needed before forking sound child process */