Skip to content

Fix targest nearest attacking ship in multiplayer #7326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wookieejedi wants to merge 3 commits into
base: master
Choose a base branch
from
+6 −4
Open

Fix targest nearest attacking ship in multiplayer #7326

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82e54a7
Fix `targest nearest attacking ship` in multiplayer
wookieejedi Mar 29, 2026
c3837d9
comment cleanup
wookieejedi Mar 29, 2026
fd26cac
comment cleanup
wookieejedi Mar 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions code/network/multi_obj.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1490,16 +1490,18 @@ int multi_oo_pack_data(net_player *pl, object *objp, ushort oo_flags, ubyte *dat
auto submode = (short)(aip->submode);
ushort target_signature = 0;

// either send out the waypoint they are trying to get to *or* their current target
// either send out the waypoint they are trying to get to *or* their current target.
if (umode == AIM_WAYPOINTS) {
// if it's already started pointing to a waypoint, grab its net_signature and send that instead
waypoint* wp;
if ((wp = find_waypoint_at_indexes(aip->wp_list_index, aip->wp_index)) != nullptr) {
target_signature = Objects[wp->get_objnum()].net_signature;
}
} // send the target signature. 2021 Version!
else if ((aip->goals[0].target_name != nullptr) && strlen(aip->goals[0].target_name) != 0) {

} else if (aip->target_objnum >= 0) {
// prefer live target_objnum so clients can check both ordered goal targets and spontaneous targets
target_signature = Objects[aip->target_objnum].net_signature;
} else if ((aip->goals[0].target_name != nullptr) && strlen(aip->goals[0].target_name) != 0) {
// send the target signature. 2021 Version!
int instance = ship_name_lookup(aip->goals[0].target_name);
if (instance > -1) {
target_signature = Objects[Ships[instance].objnum].net_signature;
Expand Down
Loading