From db4005fca625e52a5cb5abfec07b1a388148f7db Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 16 Jul 2022 15:26:12 +0000 Subject: [PATCH] Hold `Network_laser_track` `const` in `multi_do_fire` --- similar/main/multi.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/similar/main/multi.cpp b/similar/main/multi.cpp index c8a841e9d..eda918cc6 100644 --- a/similar/main/multi.cpp +++ b/similar/main/multi.cpp @@ -1528,16 +1528,13 @@ static void multi_do_fire(fvmobjptridx &vmobjptridx, const playernum_t pnum, con const uint8_t untrusted_raw_weapon = buf[2]; flags = buf[4]; - icobjidx_t Network_laser_track = object_none; - if (buf[0] == MULTI_FIRE_TRACK) - { - Network_laser_track = GET_INTEL_SHORT(&buf[17]); - Network_laser_track = objnum_remote_to_local(Network_laser_track, buf[19]); - } shot_orientation.x = static_cast(GET_INTEL_INT(&buf[5])); shot_orientation.y = static_cast(GET_INTEL_INT(&buf[9])); shot_orientation.z = static_cast(GET_INTEL_INT(&buf[13])); + const icobjidx_t Network_laser_track = (buf[0] == MULTI_FIRE_TRACK) + ? objnum_remote_to_local(GET_INTEL_SHORT(&buf[17]), buf[19]) + : object_none; Assert (pnum < N_players);