incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update game join procedure implementation

Browse Source
This commit is contained in:
Martin Michelsen
2026-05-25 07:57:10 -07:00
parent fffd2c3e62
commit 62a9da9ed3
13 changed files with 139 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ServerState.cc
+20
View File
@@ -192,6 +192,26 @@ void ServerState::send_lobby_join_notifications(shared_ptr<Lobby> l, shared_ptr<
send_player_join_notification(watcher_c, watcher_l, joining_client);
}
}
if (l->is_game()) {
for (auto lc : l->clients) {
if (!lc || (lc == joining_client)) {
continue;
}
if (lc->lobby_client_id == l->leader_id) {
l->log.info_f("Expecting {} to send game state to {}", lc->channel->name, joining_client->channel->name);
lc->expected_game_state_sync_commands.emplace(0x6B00 | (joining_client->lobby_client_id));
lc->expected_game_state_sync_commands.emplace(0x6C00 | (joining_client->lobby_client_id));
lc->expected_game_state_sync_commands.emplace(0x6D00 | (joining_client->lobby_client_id));
lc->expected_game_state_sync_commands.emplace(0x6E00 | (joining_client->lobby_client_id));
lc->expected_game_state_sync_commands.emplace(0x6F00 | (joining_client->lobby_client_id));
lc->expected_game_state_sync_commands.emplace(0x7100 | (joining_client->lobby_client_id));
lc->expected_game_state_sync_commands.emplace(0x7200);
}
l->log.info_f("Expecting {} to send 6x70 to {}", lc->channel->name, joining_client->channel->name);
lc->expected_game_state_sync_commands.emplace(0x7000 | (joining_client->lobby_client_id));
}
}
}
shared_ptr<Lobby> ServerState::find_lobby(uint32_t lobby_id) {