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

Fix last line in the .demo file not being processed

Browse Source 
Fix timings for OOC being really busted if max_wait is -1 (dunno at which point this bug was introduced)
This commit is contained in:
Crystalwarrior 2021-04-21 02:14:49 +03:00
parent d0ef4831de
commit 7b058d1401
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/demoserver.cpp
View File

@ -264,22 +264,26 @@ void DemoServer::playback()
if (current_packet.startsWith("MS#")) if (current_packet.startsWith("MS#"))
elapsed_time = 0; elapsed_time = 0;
while (!current_packet.startsWith("wait") && !demo_data.isEmpty()) { while (!current_packet.startsWith("wait#")) {
client_sock->write(current_packet.toUtf8()); client_sock->write(current_packet.toUtf8());
if (demo_data.isEmpty())
break;
current_packet = demo_data.dequeue(); current_packet = demo_data.dequeue();
} }
if (!demo_data.isEmpty()) { if (!demo_data.isEmpty()) {
AOPacket wait_packet = AOPacket(current_packet); AOPacket wait_packet = AOPacket(current_packet);
int duration = wait_packet.get_contents().at(0).toInt(); int duration = wait_packet.get_contents().at(0).toInt();
if (max_wait != -1 && duration + elapsed_time > max_wait) { if (max_wait != -1) {
duration = qMax(0, max_wait - elapsed_time); if (duration + elapsed_time > max_wait) {
// Skip the difference on the timers duration = qMax(0, max_wait - elapsed_time);
emit skip_timers(wait_packet.get_contents().at(0).toInt() - duration); // Skip the difference on the timers
}
else if (timer->interval() != 0 && duration + elapsed_time > timer->interval()) {
duration = qMax(0, timer->interval() - elapsed_time);
emit skip_timers(wait_packet.get_contents().at(0).toInt() - duration); emit skip_timers(wait_packet.get_contents().at(0).toInt() - duration);
}
else if (timer->interval() != 0 && duration + elapsed_time > timer->interval()) {
duration = qMax(0, timer->interval() - elapsed_time);
emit skip_timers(wait_packet.get_contents().at(0).toInt() - duration);
}
} }
elapsed_time += duration; elapsed_time += duration;
timer->start(duration); timer->start(duration);