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

more ep3 comamnd details

Browse Source
This commit is contained in:
Martin Michelsen
2022-12-11 23:02:14 -08:00
parent 9a2ed4c5ec
commit ed2568fc7a
6 changed files with 138 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ReceiveCommands.cc
+5 -1
View File
@@ -1061,8 +1061,9 @@ static void on_ep3_server_data_request(shared_ptr<ServerState> s, shared_ptr<Cli
} else {
l->log.info("Recreating Episode 3 server state");
}
auto tourn = l->tournament_match ? l->tournament_match->tournament.lock() : nullptr;
l->ep3_server_base = make_shared<Episode3::ServerBase>(
l, s->ep3_data_index, l->random_seed, l->tournament_match ? true : false);
l, s->ep3_data_index, l->random_seed, tourn ? tourn->get_map() : nullptr);
l->ep3_server_base->init();
if (s->ep3_behavior_flags & Episode3::BehaviorFlag::ENABLE_STATUS_MESSAGES) {
@@ -3056,8 +3057,11 @@ static void on_client_ready(shared_ptr<ServerState> s, shared_ptr<Client> c,
send_get_player_info(c);
}
auto watched_lobby = l->watched_lobby.lock();
if (l->battle_player && (l->flags & Lobby::Flag::START_BATTLE_PLAYER_IMMEDIATELY)) {
l->battle_player->start();
} else if (watched_lobby && watched_lobby->ep3_server_base) {
watched_lobby->ep3_server_base->server->send_commands_for_joining_spectator(c->channel);
}
}