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/Episode3/Server.cc
+10 -7
View File
@@ -35,11 +35,12 @@ ServerBase::ServerBase(
shared_ptr<Lobby> lobby,
shared_ptr<const DataIndex> data_index,
uint32_t random_seed,
bool is_tournament)
shared_ptr<const DataIndex::MapEntry> map_if_tournament)
: lobby(lobby),
data_index(data_index),
random_seed(random_seed),
is_tournament(is_tournament) { }
is_tournament(!!map_if_tournament),
last_chosen_map(map_if_tournament) { }
void ServerBase::init() {
this->reset();
@@ -228,8 +229,9 @@ void Server::send_commands_for_joining_spectator(Channel& c) const {
}
}
if (this->last_chosen_map) {
string data = this->prepare_6xB6x41_map_definition(this->last_chosen_map);
auto map = this->base()->last_chosen_map;
if (map) {
string data = this->prepare_6xB6x41_map_definition(map);
c.send(0x6C, 0x00, data);
}
@@ -2134,13 +2136,14 @@ void Server::handle_6xB3x41_map_request(const string& data) {
this->send_debug_command_received_message(
cmd.header.subsubcommand, "MAP DATA");
auto l = this->base()->lobby.lock();
auto base = this->base();
auto l = base->lobby.lock();
if (!l) {
throw runtime_error("lobby is deleted");
}
this->last_chosen_map = this->base()->data_index->definition_for_map_number(cmd.map_number);
auto out_cmd = this->prepare_6xB6x41_map_definition(this->last_chosen_map);
base->last_chosen_map = base->data_index->definition_for_map_number(cmd.map_number);
auto out_cmd = this->prepare_6xB6x41_map_definition(base->last_chosen_map);
send_command(l, 0x6C, 0x00, out_cmd);
for (auto watcher_l : l->watcher_lobbies) {
send_command(watcher_l, 0x6C, 0x00, out_cmd);
src/Episode3/Server.hh
+2 -2
View File
@@ -59,7 +59,7 @@ public:
std::shared_ptr<Lobby> lobby,
std::shared_ptr<const DataIndex> data_index,
uint32_t random_seed,
bool is_tournament);
std::shared_ptr<const DataIndex::MapEntry> map_if_tournament);
void init();
void reset();
void recreate_server();
@@ -76,6 +76,7 @@ public:
std::shared_ptr<const DataIndex> data_index;
uint32_t random_seed;
bool is_tournament;
std::shared_ptr<const DataIndex::MapEntry> last_chosen_map;
std::shared_ptr<MapAndRulesState> map_and_rules1;
std::shared_ptr<MapAndRulesState> map_and_rules2;
@@ -235,7 +236,6 @@ private:
static const std::unordered_map<uint8_t, handler_t> subcommand_handlers;
std::weak_ptr<ServerBase> w_base;
std::shared_ptr<const DataIndex::MapEntry> last_chosen_map;
public:
uint32_t battle_finished;