actually fix #61

BGforgeNet · Jan 20, 2021 · 663dee7 · 663dee7
1 parent 29b66a0
commit 663dee7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 20 deletions.
diff --git a/scripts_src/generic/ziwoddor.ssl b/scripts_src/generic/ziwoddor.ssl
@@ -322,6 +322,14 @@ procedure use_obj_on_p_proc begin
    variable Tool;
 
    Tool:=obj_pid(obj_being_used_with);
+    if (Tool == PID_CROWBAR) then begin
+        script_overrides;
+        call Pry_Door;
+    end
+    if ((Tool == PID_DYNAMITE) or (Tool == PID_PLASTIC_EXPLOSIVES)) then begin
+        script_overrides;
+        call Set_Trap;
+    end
 
    if (LOCK_STATUS == STATE_STANDARD_LOCK) then begin
        if (Tool == PID_LOCKPICKS) then begin
@@ -365,16 +373,6 @@ procedure use_obj_on_p_proc begin
        end
    end
 
-   else if (Tool == PID_CROWBAR) then begin
-       script_overrides;
-       call Pry_Door;
-   end
-
-   else if ((Tool == PID_DYNAMITE) or (Tool == PID_PLASTIC_EXPLOSIVES)) then begin
-       script_overrides;
-       call Set_Trap;
-   end
-
 end
 
 

diff --git a/scripts_src/headers/doors_containers.h b/scripts_src/headers/doors_containers.h
@@ -259,26 +259,23 @@ be checked against a prototype.
 #ifndef custom_use_obj_on_p_proc
   procedure use_obj_on_p_proc begin
     variable Tool;
-
     Tool:=obj_pid(obj_being_used_with);
-
-    full_lockpick_block
-
-    else if (Tool == PID_CROWBAR) then begin
-      script_overrides; //added by killap
+
+    if (Tool == PID_CROWBAR) then begin
+      script_overrides;
       call Pry_Door;
     end
-
-    else if ((Tool == PID_DYNAMITE) or (Tool == PID_PLASTIC_EXPLOSIVES)) then begin
-      script_overrides; //added by killap
+    if ((Tool == PID_DYNAMITE) or (Tool == PID_PLASTIC_EXPLOSIVES)) then begin
+      script_overrides;
       call Set_Trap;
     end
 
+    full_lockpick_block
   end
 #endif
 
 #ifndef custom_start
-procedure start begin end
+  procedure start begin end
 #endif
 
 /***************************************************************************