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

Fix testimony recorder

Browse Source 
Fixes the entirely broken testimony recorder and makes it work like intended.

Co-Authored-By: Cerapter <43446478+Cerapter@users.noreply.github.com>
Co-Authored-By: Salanto <62221668+Salanto@users.noreply.github.com>
This commit is contained in:
MangosArentLiterature 2021-06-03 16:10:28 -05:00
parent 17cd92bc5b
commit 526ebcf635
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/area_data.cpp
View File

@ -406,11 +406,11 @@ std::pair<QStringList, AreaData::TestimonyProgress> AreaData::jumpToStatement(in
m_statement = f_position; m_statement = f_position;
if (m_statement > m_testimony.size() - 1) { if (m_statement > m_testimony.size() - 1) {
m_statement = 0; m_statement = 1;
return {m_testimony.at(m_statement), TestimonyProgress::LOOPED}; return {m_testimony.at(m_statement), TestimonyProgress::LOOPED};
} }
if (m_statement <= 0) { if (m_statement <= 1) {
m_statement = 0; m_statement = 1;
return {m_testimony.at(m_statement), TestimonyProgress::STAYED_AT_FIRST}; return {m_testimony.at(m_statement), TestimonyProgress::STAYED_AT_FIRST};
} }
else { else {

2
core/src/commands/casing.cpp
View File

@ -164,7 +164,7 @@ void AOClient::cmdPauseTestimony(int argc, QStringList argv)
{ {
AreaData* area = server->areas[current_area]; AreaData* area = server->areas[current_area];
area->setTestimonyRecording(AreaData::TestimonyRecording::STOPPED); area->setTestimonyRecording(AreaData::TestimonyRecording::STOPPED);
server->broadcast(AOPacket("RT",{"testimony1#1"}), current_area); server->broadcast(AOPacket("RT",{"testimony1", "1"}), current_area);
sendServerMessage("Testimony has been stopped."); sendServerMessage("Testimony has been stopped.");
} }

13
core/src/packets.cpp
View File

@ -788,7 +788,9 @@ AOPacket AOClient::validateIcPacket(AOPacket packet)
if (args[4] == ">") { if (args[4] == ">") {
pos = "wit"; pos = "wit";
std::make_pair(args, l_progress) = area->jumpToStatement(area->statement() + 1); auto l_statement = area->jumpToStatement(area->statement() +1);
args = l_statement.first;
l_progress = l_statement.second;
if (l_progress == AreaData::TestimonyProgress::LOOPED) { if (l_progress == AreaData::TestimonyProgress::LOOPED) {
sendServerMessageArea("Last statement reached. Looping to first statement."); sendServerMessageArea("Last statement reached. Looping to first statement.");
@ -796,7 +798,9 @@ AOPacket AOClient::validateIcPacket(AOPacket packet)
} }
if (args[4] == "<") { if (args[4] == "<") {
pos = "wit"; pos = "wit";
std::make_pair(args, l_progress) = area->jumpToStatement(area->statement() - 1); auto l_statement = area->jumpToStatement(area->statement() - 1);
args = l_statement.first;
l_progress = l_statement.second;
if (l_progress == AreaData::TestimonyProgress::STAYED_AT_FIRST) { if (l_progress == AreaData::TestimonyProgress::STAYED_AT_FIRST) {
sendServerMessage("First statement reached."); sendServerMessage("First statement reached.");
@ -808,7 +812,10 @@ AOPacket AOClient::validateIcPacket(AOPacket packet)
QRegularExpressionMatch match = jump.match(decoded_message); QRegularExpressionMatch match = jump.match(decoded_message);
if (match.hasMatch()) { if (match.hasMatch()) {
pos = "wit"; pos = "wit";
std::make_pair(args, l_progress) = area->jumpToStatement(match.captured("int").toInt()); auto l_statement = area->jumpToStatement(match.captured("int").toInt());
args = l_statement.first;
l_progress = l_statement.second;
switch (l_progress){ switch (l_progress){
case AreaData::TestimonyProgress::LOOPED: case AreaData::TestimonyProgress::LOOPED: