Mamanyonyo/akashi-esquizolandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

send packet to show timer

Browse Source
This commit is contained in:
in1tiate 2021-03-06 00:16:39 -06:00
parent e65caf2a59
commit 2e3a16c9b0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/commands.cpp
View File

@ -566,11 +566,9 @@ void AOClient::cmdTimer(int argc, QStringList argv)
QTime current_time(0, 0, 0, global_timer->remainingTime()); QTime current_time(0, 0, 0, global_timer->remainingTime());
timers.append("Global timer is at " + current_time.toString("hh:mm:ss.zzz")); timers.append("Global timer is at " + current_time.toString("hh:mm:ss.zzz"));
} }
for (AreaData* area : server->areas) {
for (QTimer* timer : area->timers) { for (QTimer* timer : area->timers) {
timers.append(getAreaTimer(area->index, timer)); timers.append(getAreaTimer(area->index, timer));
} }
}
sendServerMessage(timers.join("\n")); sendServerMessage(timers.join("\n"));
return; return;
} }
@ -585,7 +583,7 @@ void AOClient::cmdTimer(int argc, QStringList argv)
if (timer_id == 0) { if (timer_id == 0) {
QTimer* global_timer = server->timer; QTimer* global_timer = server->timer;
if (global_timer->isActive()) { if (global_timer->isActive()) {
QTime current_time(0, 0, 0, global_timer->remainingTime()); QTime current_time = QTime(0, 0, 0, global_timer->remainingTime());
sendServerMessage("Global timer is at " + current_time.toString("hh:mm:ss.zzz")); sendServerMessage("Global timer is at " + current_time.toString("hh:mm:ss.zzz"));
return; return;
} }
@ -612,6 +610,7 @@ void AOClient::cmdTimer(int argc, QStringList argv)
requested_timer->setInterval(QTime(0,0).msecsTo(requested_time)); requested_timer->setInterval(QTime(0,0).msecsTo(requested_time));
requested_timer->start(); requested_timer->start();
sendServerMessage("Set timer " + QString::number(timer_id) + " to " + argv[1] + "."); sendServerMessage("Set timer " + QString::number(timer_id) + " to " + argv[1] + ".");
sendPacket("TI", {QString::number(timer_id), QString::number(2)});
sendPacket("TI", {QString::number(timer_id), QString::number(0), QString::number(QTime(0,0).msecsTo(requested_time))}); sendPacket("TI", {QString::number(timer_id), QString::number(0), QString::number(QTime(0,0).msecsTo(requested_time))});
return; return;
} }
@ -619,6 +618,7 @@ void AOClient::cmdTimer(int argc, QStringList argv)
if (argv[1] == "start") { if (argv[1] == "start") {
requested_timer->start(); requested_timer->start();
sendServerMessage("Started timer " + QString::number(timer_id) + "."); sendServerMessage("Started timer " + QString::number(timer_id) + ".");
sendPacket("TI", {QString::number(timer_id), QString::number(2)});
sendPacket("TI", {QString::number(timer_id), QString::number(0), QString::number(requested_timer->remainingTime())}); sendPacket("TI", {QString::number(timer_id), QString::number(0), QString::number(requested_timer->remainingTime())});
} }
else if (argv[1] == "pause" || argv[1] == "stop") { else if (argv[1] == "pause" || argv[1] == "stop") {
@ -744,7 +744,7 @@ QString AOClient::getAreaTimer(int area_idx, QTimer* timer)
{ {
AreaData* area = server->areas[area_idx]; AreaData* area = server->areas[area_idx];
if (timer->isActive()) { if (timer->isActive()) {
QTime current_time (0,0,0,timer->remainingTime()); QTime current_time = QTime(0,0,0,timer->remainingTime());
return "Timer " + QString::number(area->timers.indexOf(timer) + 1) + " is at " + current_time.toString("hh:mm:ss.zzz"); return "Timer " + QString::number(area->timers.indexOf(timer) + 1) + " is at " + current_time.toString("hh:mm:ss.zzz");
} }
else { else {