From d9c06e25c5c2833018cbbd63872dbc122375e721 Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Sun, 9 Oct 2022 23:15:21 +0000
Subject: [PATCH] Pass std::ranges::subrange to multi_execute_save_game

---
 common/main/multi.h    | 8 ++++++--
 similar/main/multi.cpp | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/main/multi.h b/common/main/multi.h
index 4250ec2c3..c4eff06ce 100644
--- a/common/main/multi.h
+++ b/common/main/multi.h
@@ -29,7 +29,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include <type_traits>
 #include "dxxsconf.h"
 #include "fwd-partial_range.h"
-#include "fwd-player.h"
+#include "player.h"
 #include "player-callsign.h"
 #include "player-flags.h"
 #include "fwd-weapon.h"
@@ -64,6 +64,10 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "compiler-static_assert.h"
 #include <array>
 
+#ifdef dsx
+#include <ranges>
+#endif
+
 namespace dcx {
 
 struct _sockaddr
@@ -522,7 +526,7 @@ void multi_disconnect_player(playernum_t);
 namespace dsx {
 void multi_initiate_save_game();
 void multi_initiate_restore_game();
-void multi_execute_save_game(d_game_unique_state::save_slot slot, const d_game_unique_state::savegame_description &desc, partial_range_t<const player *> player_range);
+void multi_execute_save_game(d_game_unique_state::save_slot slot, const d_game_unique_state::savegame_description &desc, std::ranges::subrange<const player *> player_range);
 #if defined(DXX_BUILD_DESCENT_I)
 static inline void multi_send_got_flag (playernum_t) {}
 #elif defined(DXX_BUILD_DESCENT_II)
diff --git a/similar/main/multi.cpp b/similar/main/multi.cpp
index d80758a76..f385d2204 100644
--- a/similar/main/multi.cpp
+++ b/similar/main/multi.cpp
@@ -4869,7 +4869,7 @@ void multi_initiate_save_game()
 	multi_execute_save_game(slot, desc, player_range);
 }
 
-void multi_execute_save_game(const d_game_unique_state::save_slot slot, const d_game_unique_state::savegame_description &desc, const partial_range_t<const player *> player_range)
+void multi_execute_save_game(const d_game_unique_state::save_slot slot, const d_game_unique_state::savegame_description &desc, const std::ranges::subrange<const player *> player_range)
 {
 	// Make a unique game id
 	fix game_id;