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

Allow testimony to be recorded from any "wit" position (#346)

Browse Source
This commit is contained in:
in1tiate 2024-03-17 16:06:10 -05:00 committed by GitHub
parent 3c864e109f
commit 74820dadee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/packet/packet_ms.cpp
View File

@ -368,7 +368,7 @@ AOPacket *PacketMS::validateIcPacket(AOClient &client) const
client_name = client.m_current_char; // fallback in case of empty ooc name client_name = client.m_current_char; // fallback in case of empty ooc name
} }
if (area->testimonyRecording() == AreaData::TestimonyRecording::RECORDING || area->testimonyRecording() == AreaData::TestimonyRecording::ADD) { if (area->testimonyRecording() == AreaData::TestimonyRecording::RECORDING || area->testimonyRecording() == AreaData::TestimonyRecording::ADD) {
if (l_args[5] != "wit") if (!l_args[5].startsWith("wit"))
return PacketFactory::createPacket("MS", l_args); return PacketFactory::createPacket("MS", l_args);
if (area->statement() == -1) { if (area->statement() == -1) {
@ -385,10 +385,10 @@ AOPacket *PacketMS::validateIcPacket(AOClient &client) const
AreaData::TestimonyProgress l_progress; AreaData::TestimonyProgress l_progress;
if (l_args[4] == ">") { if (l_args[4] == ">") {
client.m_pos = "wit";
auto l_statement = area->jumpToStatement(area->statement() + 1); auto l_statement = area->jumpToStatement(area->statement() + 1);
l_args = l_statement.first; l_args = l_statement.first;
l_progress = l_statement.second; l_progress = l_statement.second;
client.m_pos = l_args[5];
client.sendServerMessageArea(client_name + " moved to the next statement."); client.sendServerMessageArea(client_name + " moved to the next statement.");
@ -397,10 +397,10 @@ AOPacket *PacketMS::validateIcPacket(AOClient &client) const
} }
} }
if (l_args[4] == "<") { if (l_args[4] == "<") {
client.m_pos = "wit";
auto l_statement = area->jumpToStatement(area->statement() - 1); auto l_statement = area->jumpToStatement(area->statement() - 1);
l_args = l_statement.first; l_args = l_statement.first;
l_progress = l_statement.second; l_progress = l_statement.second;
client.m_pos = l_args[5];
client.sendServerMessageArea(client_name + " moved to the previous statement."); client.sendServerMessageArea(client_name + " moved to the previous statement.");