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

Move other duplicate reset calls to their own method

Browse Source
This commit is contained in:
oldmud0 2021-04-23 14:29:16 -05:00
parent de4115e20a
commit 60daac3823
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/demoserver.h
View File

@ -25,7 +25,7 @@ public:
private: private:
void handle_packet(AOPacket packet); void handle_packet(AOPacket packet);
void load_demo(QString filename); void load_demo(QString filename);
void reset_all_timers(); void reset_state();
QTcpServer* tcp_server; QTcpServer* tcp_server;
QTcpSocket* client_sock = nullptr; QTcpSocket* client_sock = nullptr;

28
src/demoserver.cpp
View File

@ -162,13 +162,7 @@ void DemoServer::handle_packet(AOPacket packet)
load_demo(path); load_demo(path);
QString packet = "CT#DEMO#" + tr("Demo file loaded. Send /play or > in OOC to begin playback.") + "#1#%"; QString packet = "CT#DEMO#" + tr("Demo file loaded. Send /play or > in OOC to begin playback.") + "#1#%";
client_sock->write(packet.toUtf8()); client_sock->write(packet.toUtf8());
// Reset evidence list reset_state();
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();
} }
else if (contents[1].startsWith("/play") || contents[1] == ">") else if (contents[1].startsWith("/play") || contents[1] == ">")
{ {
@ -232,13 +226,7 @@ void DemoServer::handle_packet(AOPacket packet)
load_demo(p_path); load_demo(p_path);
QString packet = "CT#DEMO#" + tr("Current demo file reloaded. Send /play or > in OOC to begin playback.") + "#1#%"; QString packet = "CT#DEMO#" + tr("Current demo file reloaded. Send /play or > in OOC to begin playback.") + "#1#%";
client_sock->write(packet.toUtf8()); client_sock->write(packet.toUtf8());
// Reset evidence list reset_state();
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();
} }
else if (contents[1].startsWith("/min_wait")) 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#3#0#%");
client_sock->write("TI#0#1#0#%"); client_sock->write("TI#0#1#0#%");
client_sock->write("TI#1#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#3#3#0#%");
client_sock->write("TI#4#1#0#%"); client_sock->write("TI#4#1#0#%");
client_sock->write("TI#4#3#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() void DemoServer::playback()