From 7d3613db239a2a227bd1234b2766ce7b138e9ee0 Mon Sep 17 00:00:00 2001 From: Alexander Batalov Date: Sat, 18 Nov 2023 19:53:25 +0300 Subject: [PATCH] Fix obj_being_used_with compare with pid --- Fallout2/Fallout1in2/Mapper/source/scripts/09glow/GLO3WEP.ssl | 2 +- Fallout2/Fallout1in2/Mapper/source/scripts/09glow/GLO4SUPL.ssl | 2 +- Fallout2/Fallout1in2/Mapper/source/scripts/09glow/GLWBOX.ssl | 2 +- Fallout2/Fallout1in2/Mapper/source/scripts/99demo/DEMOGEN.ssl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Fallout2/Fallout1in2/Mapper/source/scripts/09glow/GLO3WEP.ssl b/Fallout2/Fallout1in2/Mapper/source/scripts/09glow/GLO3WEP.ssl index 3700b1cc9..a170f106f 100644 --- 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 index 7d86f9feb..99c27037e 100644 --- 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 index 997fc10fd..84cf867cb 100644 --- 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 index ead9ab145..d955b4fa7 100644 --- 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