TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Pass std::ranges::subrange to multi_execute_save_game

Browse source
This commit is contained in:
Kp 2022-10-09 23:15:21 +00:00
parent 31b2f1399c
commit d9c06e25c5
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/main/multi.h
View file

@ -29,7 +29,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include <type_traits> #include <type_traits>
#include "dxxsconf.h" #include "dxxsconf.h"
#include "fwd-partial_range.h" #include "fwd-partial_range.h"
#include "fwd-player.h" #include "player.h"
#include "player-callsign.h" #include "player-callsign.h"
#include "player-flags.h" #include "player-flags.h"
#include "fwd-weapon.h" #include "fwd-weapon.h"
@ -64,6 +64,10 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "compiler-static_assert.h" #include "compiler-static_assert.h"
#include <array> #include <array>
#ifdef dsx
#include <ranges>
#endif
namespace dcx { namespace dcx {
struct _sockaddr struct _sockaddr
@ -522,7 +526,7 @@ void multi_disconnect_player(playernum_t);
namespace dsx { namespace dsx {
void multi_initiate_save_game(); void multi_initiate_save_game();
void multi_initiate_restore_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) #if defined(DXX_BUILD_DESCENT_I)
static inline void multi_send_got_flag (playernum_t) {} static inline void multi_send_got_flag (playernum_t) {}
#elif defined(DXX_BUILD_DESCENT_II) #elif defined(DXX_BUILD_DESCENT_II)

2
similar/main/multi.cpp
View file

@ -4869,7 +4869,7 @@ void multi_initiate_save_game()
multi_execute_save_game(slot, desc, player_range); 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 // Make a unique game id
fix game_id; fix game_id;