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

Pass std::span to multi_process_bigdata

This commit is contained in:
Kp 2022-10-23 23:00:24 +00:00
parent 2277d90ccd
commit 862c1f0aab
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/main/multi.h
View File

@ -504,7 +504,7 @@ void multi_send_hostage_door_status(vcwallptridx_t wallnum);
void multi_prep_level_objects(const d_powerup_info_array &Powerup_info, const d_vclip_array &Vclip);
void multi_prep_level_player();
void multi_leave_game(void);
void multi_process_bigdata(const d_level_shared_robot_info_state &LevelSharedRobotInfoState, playernum_t pnum, const uint8_t *buf, uint_fast32_t len);
void multi_process_bigdata(const d_level_shared_robot_info_state &LevelSharedRobotInfoState, playernum_t pnum, std::span<const uint8_t> buf);
void multi_make_ghost_player(playernum_t);
void multi_make_player_ghost(playernum_t);
}

12
similar/main/multi.cpp
View File

@ -2421,14 +2421,15 @@ static std::optional<multiplayer_command_t> build_multiplayer_command_from_untru
}
void multi_process_bigdata(const d_level_shared_robot_info_state &LevelSharedRobotInfoState, const playernum_t pnum, const uint8_t *const buf, const uint_fast32_t len)
void multi_process_bigdata(const d_level_shared_robot_info_state &LevelSharedRobotInfoState, const playernum_t pnum, const std::span<const uint8_t> buf)
{
// Takes a bunch of messages, check them for validity,
// and pass them to multi_process_data.
uint_fast32_t bytes_processed = 0;
while( bytes_processed < len ) {
while (bytes_processed < buf.size())
{
const uint_fast32_t type = buf[bytes_processed];
if (type >= std::size(message_length))
@ -2443,13 +2444,14 @@ void multi_process_bigdata(const d_level_shared_robot_info_state &LevelSharedRob
Assert(sub_len > 0);
if ( (bytes_processed+sub_len) > len ) {
con_printf(CON_DEBUG, "multi_process_bigdata: packet type %" PRIuFAST32 " too short (%" PRIuFAST32 " > %" PRIuFAST32 ")!", type, bytes_processed + sub_len, len);
if (bytes_processed + sub_len > buf.size())
{
con_printf(CON_DEBUG, "multi_process_bigdata: packet type %" PRIuFAST32 " too short (%" PRIuFAST32 " > %" DXX_PRI_size_type ")!", type, bytes_processed + sub_len, buf.size());
Int3();
return;
}
multi_process_data(LevelSharedRobotInfoState, pnum, std::span(&buf[bytes_processed], sub_len), *mtype);
multi_process_data(LevelSharedRobotInfoState, pnum, buf.subspan(bytes_processed, sub_len), *mtype);
bytes_processed += sub_len;
}
}

2
similar/main/net_udp.cpp
View File

@ -5850,7 +5850,7 @@ void net_udp_process_mdata(const d_level_shared_robot_info_state &LevelSharedRob
// Process
multi_process_bigdata(LevelSharedRobotInfoState, pnum, subdata.data(), subdata.size());
multi_process_bigdata(LevelSharedRobotInfoState, pnum, subdata);
}
void net_udp_send_pdata()