Skip to content

Commit a769a7e

Browse files
authored
Merge pull request #1388 from Goober5000/sexp_targeted_fix
fix an old Volition bug in the targeted sexp
2 parents 991e090 + 3e6c3f6 commit a769a7e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

code/parse/sexp.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15020,7 +15020,7 @@ int sexp_targeted(int node)
1502015020
}
1502115021

1502215022
z = ship_name_lookup(CTEXT(node), 1);
15023-
if ((z < 0) || !Player_ai || (Ships[z].objnum != Player_ai->target_objnum)){
15023+
if ((z < 0) || !Player_ai || (Ships[z].objnum != Players_target)){
1502415024
return SEXP_FALSE;
1502515025
}
1502615026

@@ -15031,7 +15031,7 @@ int sexp_targeted(int node)
1503115031
}
1503215032

1503315033
if (CDR(CDR(node)) >= 0) {
15034-
ptr = Player_ai->targeted_subsys;
15034+
ptr = Players_targeted_subsys;
1503515035
if (!ptr || subsystem_stricmp(ptr->system_info->subobj_name, CTEXT(CDR(CDR(node))))){
1503615036
return SEXP_FALSE;
1503715037
}
@@ -15047,7 +15047,7 @@ int sexp_node_targeted(int node)
1504715047

1504815048
CJumpNode *jnp = jumpnode_get_by_name(CTEXT(node));
1504915049

15050-
if (jnp==NULL || !Player_ai || (jnp->GetSCPObjectNumber() != Player_ai->target_objnum)){
15050+
if (jnp==NULL || !Player_ai || (jnp->GetSCPObjectNumber() != Players_target)){
1505115051
return SEXP_FALSE;
1505215052
}
1505315053

0 commit comments

Comments
 (0)