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

merge Ep3 ServerBase and Server into one class

Browse Source
This commit is contained in:
Martin Michelsen
2023-09-09 10:13:51 -07:00
parent a40d1ad851
commit f8198580dd
17 changed files with 476 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SendCommands.cc
+3 -3
View File
@@ -2472,9 +2472,9 @@ void send_ep3_game_details(shared_ptr<Client> c, shared_ptr<Lobby> l) {
flag = 0x04;
} else if (primary_lobby &&
primary_lobby->ep3_server_base &&
primary_lobby->ep3_server_base->server->get_setup_phase() != Episode3::SetupPhase::REGISTRATION) {
cmd.rules = primary_lobby->ep3_server_base->map_and_rules1->rules;
primary_lobby->ep3_server &&
primary_lobby->ep3_server->get_setup_phase() != Episode3::SetupPhase::REGISTRATION) {
cmd.rules = primary_lobby->ep3_server->map_and_rules1->rules;
flag = 0x01;
} else {