diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2021-04-23 14:29:16 -0500 |
|---|---|---|
| committer | oldmud0 <oldmud0@users.noreply.github.com> | 2021-04-23 14:29:16 -0500 |
| commit | 60daac3823735dace691f7a065c3759dc535f60a (patch) | |
| tree | 7af71842afed1cdcef03abde089106a19a62b3c6 | |
| parent | de4115e20ab800e7ebd639cd37de6df0cd7c72f9 (diff) | |
Move other duplicate reset calls to their own method
| -rw-r--r-- | include/demoserver.h | 2 | ||||
| -rw-r--r-- | src/demoserver.cpp | 28 |
2 files changed, 14 insertions, 16 deletions
diff --git a/include/demoserver.h b/include/demoserver.h index e5d5712f..cadc52dd 100644 --- a/include/demoserver.h +++ b/include/demoserver.h @@ -25,7 +25,7 @@ public: private: void handle_packet(AOPacket packet); void load_demo(QString filename); - void reset_all_timers(); + void reset_state(); QTcpServer* tcp_server; QTcpSocket* client_sock = nullptr; diff --git a/src/demoserver.cpp b/src/demoserver.cpp index 5a0d579d..ee0fcf25 100644 --- a/src/demoserver.cpp +++ b/src/demoserver.cpp @@ -162,13 +162,7 @@ void DemoServer::handle_packet(AOPacket packet) load_demo(path); QString packet = "CT#DEMO#" + tr("Demo file loaded. Send /play or > in OOC to begin playback.") + "#1#%"; client_sock->write(packet.toUtf8()); - // Reset evidence list - client_sock->write("LE##%"); - reset_all_timers(); - // Set the BG to default (also breaks up the message queue) - client_sock->write("BN#default#wit#%"); - // Stop the wait packet timer - timer->stop(); + reset_state(); } else if (contents[1].startsWith("/play") || contents[1] == ">") { @@ -232,13 +226,7 @@ void DemoServer::handle_packet(AOPacket packet) load_demo(p_path); QString packet = "CT#DEMO#" + tr("Current demo file reloaded. Send /play or > in OOC to begin playback.") + "#1#%"; client_sock->write(packet.toUtf8()); - // Reset evidence list - client_sock->write("LE##%"); - reset_all_timers(); - // Set the BG to default (also breaks up the message queue) - client_sock->write("BN#default#wit#%"); - // Stop the wait packet timer - timer->stop(); + reset_state(); } else if (contents[1].startsWith("/min_wait")) { @@ -327,8 +315,12 @@ void DemoServer::load_demo(QString filename) } } -void DemoServer::reset_all_timers() +void DemoServer::reset_state() { + // Reset evidence list + client_sock->write("LE##%"); + + // Reset timers client_sock->write("TI#0#3#0#%"); client_sock->write("TI#0#1#0#%"); client_sock->write("TI#1#1#0#%"); @@ -339,6 +331,12 @@ void DemoServer::reset_all_timers() client_sock->write("TI#3#3#0#%"); client_sock->write("TI#4#1#0#%"); client_sock->write("TI#4#3#0#%"); + + // Set the BG to default (also breaks up the message queue) + client_sock->write("BN#default#wit#%"); + + // Stop the wait packet timer + timer->stop(); } void DemoServer::playback() |