Merge pull request #196 from alexbatalov/fix-obj-being-used-with

Fix obj_being_used_with compare with pid
rotators · Nov 21, 2023 · 517040d · 517040d
2 parents 711239e + 7d3613d
commit 517040d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Fallout2/Fallout1in2/Mapper/source/scripts/09glow/GLO3WEP.ssl b/Fallout2/Fallout1in2/Mapper/source/scripts/09glow/GLO3WEP.ssl
@@ -28,7 +28,7 @@ procedure description_p_proc begin
 end
 
 procedure use_obj_on_p_proc begin
-   if (obj_being_used_with == PID_LOCKPICKS) then begin
+   if (obj_pid(obj_being_used_with) == PID_LOCKPICKS) then begin
       if (dude_skill_success(SKILL_LOCKPICK, 0)) then begin
          set_local_var(0, 1);
          display_msg(mstr(101));

diff --git a/Fallout2/Fallout1in2/Mapper/source/scripts/09glow/GLO4SUPL.ssl b/Fallout2/Fallout1in2/Mapper/source/scripts/09glow/GLO4SUPL.ssl
@@ -62,7 +62,7 @@ procedure pick_lock begin
    else if (local_var(0) == 0) then begin
       call arm_doors;
    end
-   else if (obj_being_used_with == PID_LOCKPICKS) then begin
+   else if (obj_pid(obj_being_used_with) == PID_LOCKPICKS) then begin
       skill_roll := roll_vs_skill(dude_obj, SKILL_LOCKPICK, 0);
    end
    else begin

diff --git a/Fallout2/Fallout1in2/Mapper/source/scripts/09glow/GLWBOX.ssl b/Fallout2/Fallout1in2/Mapper/source/scripts/09glow/GLWBOX.ssl
@@ -35,7 +35,7 @@ procedure description_p_proc begin
 end
 
 procedure use_obj_on_p_proc begin
-   if (obj_being_used_with == PID_LOCKPICKS) then begin
+   if (obj_pid(obj_being_used_with) == PID_LOCKPICKS) then begin
       if (dude_skill_success(SKILL_LOCKPICK, 0)) then begin
          set_local_var(LVAR_Herebefore, 1);
          display_msg(mstr(101));

diff --git a/Fallout2/Fallout1in2/Mapper/source/scripts/99demo/DEMOGEN.ssl b/Fallout2/Fallout1in2/Mapper/source/scripts/99demo/DEMOGEN.ssl
@@ -88,7 +88,7 @@ procedure use_obj_on_p_proc begin
       inc_scrapheap_rep(REP_BONUS_GENERATOR_BROKEN);
    end
    else begin
-      if (obj_being_used_with == PID_MULTI_TOOL) then begin
+      if (obj_pid(obj_being_used_with) == PID_MULTI_TOOL) then begin
          display_msg(mstr(103));
       end
       else begin