From c575283c5eae36aaed60d83ab78bec78940ac14a Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 30 Jul 2022 17:42:59 +0000 Subject: [PATCH] Pass std::span to multi_do_boss_stop_gate --- common/main/multibot.h | 1 - common/main/multiinternal.h | 1 + similar/main/multi.cpp | 3 ++- similar/main/multibot.cpp | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/main/multibot.h b/common/main/multibot.h index 88a351bd0..89312a248 100644 --- a/common/main/multibot.h +++ b/common/main/multibot.h @@ -75,7 +75,6 @@ void multi_send_thief_frame(); #endif void multi_do_create_robot_powerups(playernum_t pnum, const ubyte *buf); -void multi_do_boss_stop_gate(const ubyte *buf); void multi_do_boss_create_robot(playernum_t pnum, const ubyte *buf); void multi_strip_robots(int playernum); diff --git a/common/main/multiinternal.h b/common/main/multiinternal.h index ec20997eb..f1fe64a6f 100644 --- a/common/main/multiinternal.h +++ b/common/main/multiinternal.h @@ -193,6 +193,7 @@ void multi_recv_escort_goal(d_unique_buddy_state &, multiplayer_rspan buf); void multi_do_boss_cloak(multiplayer_rspan buf); void multi_do_boss_start_gate(multiplayer_rspan buf); +void multi_do_boss_stop_gate(multiplayer_rspan buf); } diff --git a/similar/main/multi.cpp b/similar/main/multi.cpp index bc45c29ba..ae7c8480b 100644 --- a/similar/main/multi.cpp +++ b/similar/main/multi.cpp @@ -5811,7 +5811,8 @@ static void multi_process_data(const d_level_shared_robot_info_state &LevelShare multi_do_boss_start_gate(multi_subspan_first(data)); break; case MULTI_BOSS_STOP_GATE: - multi_do_boss_stop_gate(buf); break; + multi_do_boss_stop_gate(multi_subspan_first(data)); + break; case MULTI_BOSS_CREATE_ROBOT: multi_do_boss_create_robot(pnum, buf); break; case MULTI_CREATE_ROBOT_POWERUPS: diff --git a/similar/main/multibot.cpp b/similar/main/multibot.cpp index 389417865..b19bb5633 100644 --- a/similar/main/multibot.cpp +++ b/similar/main/multibot.cpp @@ -1173,9 +1173,8 @@ void multi_do_boss_start_gate(const multiplayer_rspan buf } restart_effect(ECLIP_NUM_BOSS); } -} -void multi_do_boss_stop_gate(const ubyte *buf) +void multi_do_boss_stop_gate(const multiplayer_rspan buf) { auto &Objects = LevelUniqueObjectState.Objects; auto &vmobjptridx = Objects.vmptridx; @@ -1193,6 +1192,7 @@ void multi_do_boss_stop_gate(const ubyte *buf) } stop_effect(ECLIP_NUM_BOSS); } +} void multi_do_boss_create_robot(const playernum_t pnum, const ubyte *buf) {