incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix chat shell command for pc and bb

Browse Source
This commit is contained in:
Martin Michelsen
2023-02-03 20:53:37 -08:00
parent 3cf309a008
commit ed770a8b74
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ServerShell.cc
+20 -10
View File
@@ -608,19 +608,29 @@ session with ID 17205AE4, run the command `on 17205AE4 sc 1D 00 04 00`.\n\
} else if ((command_name == "chat") || (command_name == "dchat")) { } else if ((command_name == "chat") || (command_name == "dchat")) {
auto session = this->get_proxy_session(session_name); auto session = this->get_proxy_session(session_name);
bool is_dchat = (command_name == "dchat");
string data(8, '\0'); if (!is_dchat && (session->version == GameVersion::PC || session->version == GameVersion::BB)) {
data.push_back('\x09'); u16string data(4, u'\0');
data.push_back('E'); data.push_back(u'\x09');
if (command_name == "dchat") { data.push_back(u'E');
data += parse_data_string(command_args); data += decode_sjis(command_args);
data.push_back(u'\0');
data.resize((data.size() + 1) & (~1));
session->server_channel.send(0x06, 0x00, data.data(), data.size() * sizeof(char16_t));
} else { } else {
data += command_args; string data(8, '\0');
data.push_back('\x09');
data.push_back('E');
if (is_dchat) {
data += parse_data_string(command_args);
} else {
data += command_args;
data.push_back('\0');
}
data.resize((data.size() + 3) & (~3));
session->server_channel.send(0x06, 0x00, data);
} }
data.push_back('\0');
data.resize((data.size() + 3) & (~3));
session->server_channel.send(0x06, 0x00, data);
} else if (command_name == "marker") { } else if (command_name == "marker") {
auto session = this->get_proxy_session(session_name); auto session = this->get_proxy_session(session_name);