added options for post delay for door actions
authorHolger Schemel <info@artsoft.org>
Thu, 2 Nov 2017 00:00:23 +0000 (01:00 +0100)
committerHolger Schemel <info@artsoft.org>
Fri, 23 Mar 2018 22:21:15 +0000 (23:21 +0100)
src/conf_gfx.c
src/main.h
src/tools.c

index 3683400..07525b6 100644 (file)
@@ -8189,12 +8189,14 @@ struct ConfigInfo image_config[] =
   { "door_1.height",                           "-1"                    },
   { "door_1.step_offset",                      "2"                     },
   { "door_1.step_delay",                       "10"                    },
+  { "door_1.post_delay",                       "100"                   },
   { "door_1.anim_mode",                                "default"               },
 
   { "door_2.width",                            "-1"                    },
   { "door_2.height",                           "-1"                    },
   { "door_2.step_offset",                      "2"                     },
   { "door_2.step_delay",                       "10"                    },
+  { "door_2.post_delay",                       "100"                   },
   { "door_2.anim_mode",                                "default"               },
 
   { "game.panel.level_number.x",               "51"                    },
index f9ffaac..1c23407 100644 (file)
@@ -2765,6 +2765,7 @@ struct DoorInfo
   int height;
   int step_offset;
   int step_delay;
+  int post_delay;
   int anim_mode;
 };
 
index a16135c..b87d720 100644 (file)
@@ -5055,6 +5055,17 @@ unsigned int MoveDoor(unsigned int door_state)
       if (door_part_done_all)
        break;
     }
+
+    if (!(door_state & DOOR_NO_DELAY))
+    {
+      /* wait for specified door action post delay */
+      if (door_state & DOOR_ACTION_1 && door_state & DOOR_ACTION_2)
+       Delay(MAX(door_1.post_delay, door_2.post_delay));
+      else if (door_state & DOOR_ACTION_1)
+       Delay(door_1.post_delay);
+      else if (door_state & DOOR_ACTION_2)
+       Delay(door_2.post_delay);
+    }
   }
 
   if (door_state & DOOR_ACTION_1)