From c977c863a83313003686bab25087bccab352f3c8 Mon Sep 17 00:00:00 2001 From: Martin Michelsen Date: Tue, 29 Jan 2019 00:17:40 -0800 Subject: [PATCH] clean up some debugging stuff and fix old comments --- Player.hh | 2 -- Server.cc | 12 ++++++------ Text.cc | 5 ----- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/Player.hh b/Player.hh index d494978a..025c7c86 100644 --- a/Player.hh +++ b/Player.hh @@ -425,8 +425,6 @@ struct Player { -#define ERROR_COMBINE_ITEM_SPLIT 0x5FFFFFFE // this error code is used to tell calling functions that a combine item needs to be split - uint32_t compute_guild_card_checksum(const void* data, size_t size); std::string filename_for_player_bb(const std::string& username, uint8_t player_index); diff --git a/Server.cc b/Server.cc index 5af2c86b..e0e38de6 100644 --- a/Server.cc +++ b/Server.cc @@ -212,14 +212,14 @@ void Server::receive_and_process_commands(shared_ptr c, struct buffereve // to call string functions on the buffer in command handlers string data = c->recv_buffer.substr(offset + header_size, size - header_size); data.append(4, '\0'); - // try { + try { process_command(this->state, c, header->command(c->version), header->flag(c->version), size - header_size, data.data()); - // } catch (const exception& e) { - // log(INFO, "[Server] error in client stream: %s", e.what()); - // c->should_disconnect = true; - // return; - // } + } catch (const exception& e) { + log(INFO, "[Server] error in client stream: %s", e.what()); + c->should_disconnect = true; + return; + } // BB pads commands to 8-byte boundaries, so if we see a shorter command, // skip over the padding diff --git a/Text.cc b/Text.cc index f6c81c05..1acfabaa 100644 --- a/Text.cc +++ b/Text.cc @@ -64,11 +64,6 @@ static const vector& unicode_to_sjis_table() { return unicode_to_sjis_table_data; } -// None of these functions truly convert between SJIS and Unicode. They will -// convert English properly (and some other languages as well), but Japanese -// text will screw up horribly -// TODO: fix this shit. this is definitely the worst part of this entire project - void encode_sjis(char* dest, const char16_t* source, size_t max) { const auto& table = unicode_to_sjis_table(); while (*source && (--max)) {