added global animation actions executed after init/anim/post delay

[rocksndiamonds.git] / src / init.c

diff --git a/src/init.c b/src/init.c
index 8d410a560b7aabd74c4f1d57cde209251cc9cab5..2bbc623807d772c1f57f755135ad58d79324445f 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -481,8 +481,8 @@ static void InitFontGraphicInfo(void)
   }
 
   // reset non-redefined ".active" font graphics if normal font is redefined
-  /* (this different treatment is needed because normal and active fonts are
-     independently defined ("active" is not a property of font definitions!) */
+  // (this different treatment is needed because normal and active fonts are
+  // independently defined ("active" is not a property of font definitions!)
   for (i = 0; i < NUM_FONTS; i++)
   {
     int font_nr_base = i;
@@ -515,8 +515,8 @@ static void InitFontGraphicInfo(void)
        boolean active_redefined =
          getImageListEntryFromImageID(active_graphic)->redefined;
 
-       /* same as above, but check special graphic definitions, for example:
-          redefined "font.menu_1.MAIN" invalidates "font.menu_1.active.MAIN" */
+       // same as above, but check special graphic definitions, for example:
+       // redefined "font.menu_1.MAIN" invalidates "font.menu_1.active.MAIN"
        if (base_redefined && !active_redefined)
        {
          font_info[font_nr_active].special_graphic[j] =
@@ -955,8 +955,8 @@ static void InitElementGraphicInfo(void)
 
   UPDATE_BUSY_STATE();
 
-  /* adjust graphics with 2nd tile for movement according to direction
-     (do this before correcting '-1' values to minimize calculations) */
+  // adjust graphics with 2nd tile for movement according to direction
+  // (do this before correcting '-1' values to minimize calculations)
   for (i = 0; i < MAX_NUM_ELEMENTS; i++)
   {
     for (act = 0; act < NUM_ACTIONS; act++)
@@ -1297,12 +1297,15 @@ static void set_graphic_parameters_ext(int graphic, int *parameter,
   g->clone_from = -1;                  // do not use clone graphic
   g->init_delay_fixed = 0;
   g->init_delay_random = 0;
+  g->init_delay_action = -1;
   g->anim_delay_fixed = 0;
   g->anim_delay_random = 0;
+  g->anim_delay_action = -1;
   g->post_delay_fixed = 0;
   g->post_delay_random = 0;
-  g->init_event = ANIM_EVENT_DEFAULT;
-  g->anim_event = ANIM_EVENT_DEFAULT;
+  g->post_delay_action = -1;
+  g->init_event = ANIM_EVENT_UNDEFINED;
+  g->anim_event = ANIM_EVENT_UNDEFINED;
   g->init_event_action = -1;
   g->anim_event_action = -1;
   g->draw_masked = FALSE;
@@ -1531,6 +1534,12 @@ static void set_graphic_parameters_ext(int graphic, int *parameter,
     g->init_event_action = parameter[GFX_ARG_INIT_EVENT_ACTION];
   if (parameter[GFX_ARG_ANIM_EVENT_ACTION] != ARG_UNDEFINED_VALUE)
     g->anim_event_action = parameter[GFX_ARG_ANIM_EVENT_ACTION];
+  if (parameter[GFX_ARG_INIT_DELAY_ACTION] != ARG_UNDEFINED_VALUE)
+    g->init_delay_action = parameter[GFX_ARG_INIT_DELAY_ACTION];
+  if (parameter[GFX_ARG_ANIM_DELAY_ACTION] != ARG_UNDEFINED_VALUE)
+    g->anim_delay_action = parameter[GFX_ARG_ANIM_DELAY_ACTION];
+  if (parameter[GFX_ARG_POST_DELAY_ACTION] != ARG_UNDEFINED_VALUE)
+    g->post_delay_action = parameter[GFX_ARG_POST_DELAY_ACTION];
 
   // used for toon animations and global animations
   g->step_offset  = parameter[GFX_ARG_STEP_OFFSET];
@@ -1723,6 +1732,8 @@ static void InitGraphicInfo(void)
     -1
   };
 
+  FreeGlobalAnimEventInfo();
+
   checked_free(graphic_info);
 
   graphic_info = checked_calloc(num_images * sizeof(struct GraphicInfo));
@@ -1970,8 +1981,8 @@ static void InitElementSoundInfo(void)
     }
   }
 
-  /* copy sound settings to some elements that are only stored in level file
-     in native R'n'D levels, but are used by game engine in native EM levels */
+  // copy sound settings to some elements that are only stored in level file
+  // in native R'n'D levels, but are used by game engine in native EM levels
   for (i = 0; copy_properties[i][0] != -1; i++)
     for (j = 1; j <= 4; j++)
       for (act = 0; act < NUM_ACTIONS; act++)
@@ -2151,8 +2162,8 @@ static void InitGameModeMusicInfo(void)
   }
 
   // now set all '-1' values to menu specific default values
-  /* (undefined values of "levelset.music[]" might stay at "-1" to
-     allow dynamic selection of music files from music directory!) */
+  // (undefined values of "levelset.music[]" might stay at "-1" to
+  // allow dynamic selection of music files from music directory!)
   for (i = 0; i < MAX_LEVELS; i++)
     if (levelset.music[i] == -1)
       levelset.music[i] = default_levelset_music;
@@ -3687,8 +3698,8 @@ void InitElementPropertiesStatic(void)
     EL_WALL_PEARL,
     EL_WALL_CRYSTAL,
 
-    /* the following elements are a direct copy of "indestructible" elements,
-       except "EL_ACID", which is "indestructible", but not "solid"! */
+    // the following elements are a direct copy of "indestructible" elements,
+    // except "EL_ACID", which is "indestructible", but not "solid"!
 #if 0
     EL_ACID,
 #endif
@@ -6061,6 +6072,8 @@ void OpenAll(void)
 
   InitNetworkSettings();
 
+  InitRuntimeInfo();
+
   if (network.serveronly)
   {
 #if defined(PLATFORM_UNIX)
@@ -6194,16 +6207,13 @@ void CloseAllAndExit(int exit_value)
 
   FreeAllImages();
 
-#if defined(TARGET_SDL)
-#if defined(TARGET_SDL2)
   // !!! TODO !!!
   // set a flag to tell the network server thread to quit and wait for it
   // using SDL_WaitThread()
-#else
-  if (network_server)  // terminate network server
-    SDL_KillThread(server_thread);
-#endif
-#endif
+  //
+  // Code used with SDL 1.2:
+  // if (network_server)       // terminate network server
+  //   SDL_KillThread(server_thread);
 
   CloseVideoDisplay();
   ClosePlatformDependentStuff();