From 2b4dd444ca075f46e46cd836508c293f92a45b5a Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Sat, 30 Jul 2022 17:42:59 +0000
Subject: [PATCH] Pass std::span to multi_do_boss_cloak

---
 common/main/multibot.h      | 5 -----
 common/main/multiinternal.h | 1 +
 similar/main/multi.cpp      | 3 ++-
 similar/main/multibot.cpp   | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/common/main/multibot.h b/common/main/multibot.h
index 2f4138f92..0445fbbac 100644
--- a/common/main/multibot.h
+++ b/common/main/multibot.h
@@ -75,11 +75,6 @@ void multi_send_thief_frame();
 #endif
 
 void multi_do_create_robot_powerups(playernum_t pnum, const ubyte *buf);
-#ifdef dsx
-namespace dsx {
-void multi_do_boss_cloak(const ubyte *buf);
-}
-#endif
 void multi_do_boss_start_gate(const ubyte *buf);
 void multi_do_boss_stop_gate(const ubyte *buf);
 void multi_do_boss_create_robot(playernum_t pnum, const ubyte *buf);
diff --git a/common/main/multiinternal.h b/common/main/multiinternal.h
index 472498432..6c47b70ba 100644
--- a/common/main/multiinternal.h
+++ b/common/main/multiinternal.h
@@ -191,6 +191,7 @@ void multi_do_robot_fire(multiplayer_rspan<MULTI_ROBOT_FIRE> buf);
 void multi_recv_escort_goal(d_unique_buddy_state &, multiplayer_rspan<MULTI_UPDATE_BUDDY_STATE> buf);
 #endif
 void multi_do_boss_teleport(const d_robot_info_array &Robot_info, const d_vclip_array &Vclip, playernum_t pnum, multiplayer_rspan<MULTI_BOSS_TELEPORT> buf);
+void multi_do_boss_cloak(multiplayer_rspan<MULTI_BOSS_CLOAK> buf);
 
 }
 
diff --git a/similar/main/multi.cpp b/similar/main/multi.cpp
index e486195bf..b8af3cf15 100644
--- a/similar/main/multi.cpp
+++ b/similar/main/multi.cpp
@@ -5805,7 +5805,8 @@ static void multi_process_data(const d_level_shared_robot_info_state &LevelShare
 			multi_do_boss_teleport(LevelSharedRobotInfoState.Robot_info, Vclip, pnum, multi_subspan_first<MULTI_BOSS_TELEPORT>(data));
 			break;
 		case MULTI_BOSS_CLOAK:
-			multi_do_boss_cloak(buf); break;
+			multi_do_boss_cloak(multi_subspan_first<MULTI_BOSS_CLOAK>(data));
+			break;
 		case MULTI_BOSS_START_GATE:
 			multi_do_boss_start_gate(buf); break;
 		case MULTI_BOSS_STOP_GATE:
diff --git a/similar/main/multibot.cpp b/similar/main/multibot.cpp
index fbf7fa549..e6eb20409 100644
--- a/similar/main/multibot.cpp
+++ b/similar/main/multibot.cpp
@@ -1130,7 +1130,7 @@ void multi_do_boss_teleport(const d_robot_info_array &Robot_info, const d_vclip_
 	boss_obj->ctype.ai_info.REMOTE_SLOT_NUM = 0; // Available immediately!
 }
 
-void multi_do_boss_cloak(const ubyte *buf)
+void multi_do_boss_cloak(const multiplayer_rspan<MULTI_BOSS_CLOAK> buf)
 {
 	auto &BossUniqueState = LevelUniqueObjectState.BossState;
 	auto &Objects = LevelUniqueObjectState.Objects;