Skip to content

Commit 329fc12

Browse files
committed
Make sure the permission check only applies to the room area
* to prevent unexpected hostile when ObjCanSeeObj_ShootThru_Fix=1 (sync with RPU)
1 parent b5f246e commit 329fc12

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

scripts_src/newreno/ncorvill.ssl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,12 @@
1313
/* Include Files */
1414
#define SCRIPT_REALNAME "ncorvill"
1515
#include "../headers/define.h"
16+
1617
#define NAME SCRIPT_NCORVILL
1718
#define TOWN_REP_VAR GVAR_TOWN_REP_NEW_RENO
19+
20+
#define dude_inside_room tile_in_tile_rect(22893, 22879, 26693, 26679, dude_tile)
21+
1822
#include "../headers/command.h"
1923
#include "../headers/newreno.h"
2024
#include "../headers/modreact.h"
@@ -162,7 +166,7 @@ procedure critter_p_proc begin
162166
if (self_can_see_dude) then begin
163167
if ((hostile) or (warned_attack)) then begin
164168
self_attack_dude;
165-
end else if (((dude_is_made_man) and (dude_family != family_wright)) or (wright_permission == false)) then begin
169+
end else if (((dude_is_made_man) and (dude_family != family_wright)) or ((wright_permission == false) and (dude_inside_room))) then begin
166170
call Node002;
167171
call Node998;
168172
end

0 commit comments

Comments
 (0)