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

fix per-lobby events in config.json

Browse Source
This commit is contained in:
Martin Michelsen
2024-03-03 23:15:35 -08:00
parent db254a977b
commit 6d6a8621bb
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ServerState.cc
+20 -20
View File
@@ -902,26 +902,6 @@ void ServerState::load_config_early() {
} catch (const out_of_range&) { } catch (const out_of_range&) {
} }
for (size_t z = 1; z <= 20; z++) {
auto l = this->find_lobby(z);
if (l) {
l->event = 0;
}
}
try {
const auto& events_json = this->config_json->get_list("LobbyEvents");
for (size_t z = 0; z < events_json.size(); z++) {
const auto& v = events_json.at(z);
uint8_t event = v->is_int() ? v->as_int() : event_for_name(v->as_string());
const auto& l = this->find_lobby(z + 1);
if (l && l->check_flag(Lobby::Flag::DEFAULT)) {
l->event = event;
send_change_event(l, l->event);
}
}
} catch (const out_of_range&) {
}
this->pre_lobby_event = 0; this->pre_lobby_event = 0;
try { try {
auto v = this->config_json->at("MenuEvent"); auto v = this->config_json->at("MenuEvent");
@@ -1091,6 +1071,26 @@ void ServerState::load_config_early() {
} }
void ServerState::load_config_late() { void ServerState::load_config_late() {
for (size_t z = 1; z <= 20; z++) {
auto l = this->find_lobby(z);
if (l) {
l->event = 0;
}
}
try {
const auto& events_json = this->config_json->get_list("LobbyEvents");
for (size_t z = 0; z < events_json.size(); z++) {
const auto& v = events_json.at(z);
uint8_t event = v->is_int() ? v->as_int() : event_for_name(v->as_string());
const auto& l = this->find_lobby(z + 1);
if (l && l->check_flag(Lobby::Flag::DEFAULT)) {
l->event = event;
send_change_event(l, l->event);
}
}
} catch (const out_of_range&) {
}
this->ep3_card_auction_pool.clear(); this->ep3_card_auction_pool.clear();
try { try {
for (const auto& it : this->config_json->get_dict("CardAuctionPool")) { for (const auto& it : this->config_json->get_dict("CardAuctionPool")) {