Even more robust no-locked-open policy.

Ref #381
BGforgeNet/Fallout2_Unofficial_Patch#61

Author: burner1024

scripts_src/generic/ziwoddor.ssl

@@ -127,7 +127,6 @@ procedure Damage_Critter;
 procedure trap_search_result(variable found_trap, variable who);
 procedure real_explosion(variable explosive);
 procedure roll_critical;
-procedure ensure_no_locked_open;
 
 /*****************************************************************
 Local Variables which are saved. All Local Variables need to be
@@ -478,7 +477,7 @@ the player locks it once more.
 procedure map_enter_p_proc begin
     call ensure_no_locked_open;
 
-    /* Set up the door state when the player enters the map */
+    /* Don't change door state when player is already on the map */
     if is_loading_game then return;
 
     // Initial setup runs once per game
@@ -492,37 +491,12 @@ procedure map_enter_p_proc begin
     // Some doors, like Rebecca's basement door, have dynamic LOCKED_STATUS. Active when she's alive, inactive when dead.
     // Same for Eldrige, etc. They re-lock on re-entering the map.
     if (LOCKED_STATUS == STATE_ACTIVE) then begin
-      if obj_is_open(self_obj) then begin
-        obj_close(self_obj);
-      end
-      obj_lock(self_obj);
+      call close_and_lock_self;
     end else begin
       obj_unlock(self_obj);
     end
 end
 
-/**
- * Ensure that we don't have objects "locked open".
- * This shouldn't happen, but apparently does.
- * If we're entering a map, and the object is "locked open", then close it.
- * If we're loading a game, (already on the map) then just unlock.
- */
-procedure ensure_no_locked_open begin
-  // If not "locked open", skip
-  if not (obj_is_open(self_obj) and obj_is_locked(self_obj)) then return;
-
-  // We don't want to close+re-lock the door on simple game load, that makes gameplay inconsistent. So we just unlock.
-  if is_loading_game then begin
-    obj_unlock(self_obj);
-  end else begin
-    // But if it's map change, close+lock is justified.
-    // defensive: if the door is "locked open", then unlock first, otherwise close fails
-    obj_unlock(self_obj);
-    obj_close(self_obj);
-    obj_lock(self_obj);
-  end
-end
-
 /**************************************************************************************
 This procedure gets called roughly every 30 seconds of real time. It is used to make
 sure that the door does not lock on it's own and that the player will be able to get

scripts_src/headers/command.h

@@ -1369,4 +1369,39 @@ variable removed_qty;
 )
 #define can_be_gas_poisoned(x) ((x == dude_obj) and not (protected_from_gas(x)))
 
+// DOORS //
+/**
+ * Ensure that we don't have objects "locked open".
+ * This shouldn't happen, but apparently does.
+ * If we're entering a map, and the object is "locked open", then close it.
+ * If we're loading a game, (already on the map) then just unlock.
+ */
+procedure ensure_no_locked_open begin
+  // If not "locked open", skip
+  if not (obj_is_open(self_obj) and obj_is_locked(self_obj)) then return;
+
+  // We don't want to close+re-lock the door on game load, that makes gameplay inconsistent. So we just unlock.
+  if is_loading_game then begin
+    obj_unlock(self_obj);
+  end else begin
+    // But if PC enters the map, close+lock is justified.
+    // defensive: if the object is "locked open", then unlock first, otherwise close fails
+    obj_unlock(self_obj);
+    obj_close(self_obj);
+    obj_lock(self_obj);
+  end
+end
+
+/**
+ * Optionally closes, then non-optionally locks `self_obj`.
+ * So that we don't have objects "locked open".
+ */
+procedure close_and_lock_self begin
+   if obj_is_open(self_obj) then begin
+      obj_close(self_obj);
+   end
+   obj_lock(self_obj);
+end
+// END DOORS
+
 #endif // COMMAND_H

scripts_src/headers/doors_containers.h

@@ -1222,19 +1222,20 @@ the player locks it once more.
 ***************************************************************************************/
 #ifndef custom_map_enter_p_proc
   procedure map_enter_p_proc begin
+    call ensure_no_locked_open;
+
+    /* Don't change door state when player is already on the map */
+    if is_loading_game then return;
+
     /* Set up the door state when the player first enters the map */
     if (local_var(LVAR_Set_Door_Status) == 0) then begin
-      set_local_var(LVAR_Set_Door_Status,1);
-      set_local_var(LVAR_Locked,LOCKED_STATUS);
-      set_local_var(LVAR_Trapped,TRAPPED_STATUS);
+      set_local_var(LVAR_Set_Door_Status, 1);
+      set_local_var(LVAR_Locked, LOCKED_STATUS);
+      set_local_var(LVAR_Trapped, TRAPPED_STATUS);
     end
+
     if (local_var(LVAR_Locked) == STATE_ACTIVE) then begin
-      // Ensure that we don't have objects "locked open"
-      if obj_is_open(self_obj) then begin
-        obj_close(self_obj);
-      end
-      // Ensure locked status
-      obj_lock(self_obj);
+      call close_and_lock_self;
     end else begin
       obj_unlock(self_obj);
     end