Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

demo fixes (#1095)

Browse Source 
- fix RD being recorded twice
- fix demos recording themselves
This commit is contained in:
in1tiate 2025-04-21 16:54:20 -05:00 committed by GitHub
parent e34b875b1d
commit 2977ed8620
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/packet_distribution.cpp
View File

@ -9,6 +9,10 @@
void AOApplication::append_to_demofile(QString packet_string) void AOApplication::append_to_demofile(QString packet_string)
{ {
if (demo_server) // Currently playing a demo
{
return;
}
if (Options::getInstance().logToDemoFileEnabled() && !log_filename.isEmpty()) if (Options::getInstance().logToDemoFileEnabled() && !log_filename.isEmpty())
{ {
QString path = log_filename.left(log_filename.size()).replace(".log", ".demo"); QString path = log_filename.left(log_filename.size()).replace(".log", ".demo");
@ -163,7 +167,7 @@ void AOApplication::server_packet_received(AOPacket packet)
QString server_name_stripped = server_name; QString server_name_stripped = server_name;
static QRegularExpression illegal_filename_chars("[\\\\/:*?\"<>|\']"); static QRegularExpression illegal_filename_chars("[\\\\/:*?\"<>|\']");
if (Options::getInstance().logToDemoFileEnabled() && server_name != "Demo playback") if (Options::getInstance().logToDemoFileEnabled() && !demo_server)
{ {
this->log_filename = QDateTime::currentDateTime().toUTC().toString("'logs/" + server_name_stripped.remove(illegal_filename_chars) + "/'yyyy-MM-dd hh-mm-ss t'.log'"); this->log_filename = QDateTime::currentDateTime().toUTC().toString("'logs/" + server_name_stripped.remove(illegal_filename_chars) + "/'yyyy-MM-dd hh-mm-ss t'.log'");
this->write_to_file("Joined server " + server_name_stripped + " hosted on address " + server_address + " on " + QDateTime::currentDateTime().toUTC().toString(), log_filename, true); this->write_to_file("Joined server " + server_name_stripped + " hosted on address " + server_address + " on " + QDateTime::currentDateTime().toUTC().toString(), log_filename, true);
@ -691,11 +695,6 @@ void AOApplication::server_packet_received(AOPacket packet)
PlayerRegister update{content.at(0).toInt(), PlayerRegister::REGISTER_TYPE(content.at(1).toInt())}; PlayerRegister update{content.at(0).toInt(), PlayerRegister::REGISTER_TYPE(content.at(1).toInt())};
w_courtroom->playerList()->registerPlayer(update); w_courtroom->playerList()->registerPlayer(update);
if (log_to_demo)
{
append_to_demofile(packet.toString(true));
}
} }
else if (header == "PU") else if (header == "PU")
{ {