X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=60f11d7631ef4582c26b671573069dc1236b66e6;hb=cdc3c940197937b0508a1eb7dcf44874951908b7;hp=1f58073285447eaab1dac4f132d8be8288442f8c;hpb=494b886d5c5041013ea361a12a07d7cd87551d52;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index 1f580732..60f11d76 100644
--- a/src/init.c
+++ b/src/init.c
@@ -3949,6 +3949,12 @@ 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].use_action)
+	SET_PROPERTY(i, EP_HAS_ACTION, TRUE);
+
     /* ---------- GFX_CRUMBLED --------------------------------------------- */
 #if 1
     SET_PROPERTY(i, EP_GFX_CRUMBLED,
@@ -4280,6 +4286,11 @@ static void InitSetup()
     options.verbose = TRUE;
 }
 
+static void InitGameInfo()
+{
+  game.restart_level = FALSE;
+}
+
 static void InitPlayerInfo()
 {
   int i;
@@ -4415,7 +4426,7 @@ static void InitArtworkConfig()
 
   for (i = 0; i < NUM_MUSIC_PREFIXES; i++)
     music_id_prefix[i] = music_prefix_info[i].prefix;
-  music_id_prefix[MAX_LEVELS] = NULL;
+  music_id_prefix[NUM_MUSIC_PREFIXES] = NULL;
 
   for (i = 0; i < NUM_ACTIONS; i++)
     action_id_suffix[i] = element_action_info[i].suffix;
@@ -4838,6 +4849,7 @@ void OpenAll()
 
   InitSetup();
 
+  InitGameInfo();
   InitPlayerInfo();
   InitArtworkInfo();		/* needed before loading gfx, sound & music */
   InitArtworkConfig();		/* needed before forking sound child process */