From: Holger Schemel <info@artsoft.org>
Date: Thu, 2 Nov 2017 00:00:23 +0000 (+0100)
Subject: added options for post delay for door actions
X-Git-Tag: 4.1.0.0~74
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=c80e8f65b8f026f8b06673f06cea31cc2667351f;p=rocksndiamonds.git

added options for post delay for door actions
---

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 36834005..07525b6f 100644
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -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"			},
diff --git a/src/main.h b/src/main.h
index f9ffaac8..1c23407d 100644
--- a/src/main.h
+++ b/src/main.h
@@ -2765,6 +2765,7 @@ struct DoorInfo
   int height;
   int step_offset;
   int step_delay;
+  int post_delay;
   int anim_mode;
 };
 
diff --git a/src/tools.c b/src/tools.c
index a16135cc..b87d7201 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -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)