diff options
| -rw-r--r-- | po/POTFILES.in | 1 | ||||
| -rw-r--r-- | src/net/charserverhandler.cpp | 57 |
2 files changed, 15 insertions, 43 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in index a70d35d4..fcda80d4 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -41,6 +41,7 @@ src/gui/speechbubble.cpp src/gui/status.cpp src/gui/trade.cpp src/gui/updatewindow.cpp +src/net/charserverhandler.cpp src/net/playerhandler.cpp src/net/tradehandler.cpp src/resources/colordb.cpp diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp index bd3685f3..345b8960 100644 --- a/src/net/charserverhandler.cpp +++ b/src/net/charserverhandler.cpp @@ -23,7 +23,6 @@ #include "messagein.h" #include "protocol.h" -#include "../extensions.h" #include "../game.h" #include "../localplayer.h" #include "../log.h" @@ -33,13 +32,9 @@ #include "../gui/char_select.h" #include "../gui/ok_dialog.h" +#include "../utils/gettext.h" #include "../utils/tostring.h" -/* - * Yeah, this is a global. Get over it. - */ -struct EXTENSIONS extensions; - CharServerHandler::CharServerHandler(): mCharCreateDialog(0) { @@ -72,61 +67,37 @@ void CharServerHandler::handleMessage(MessageIn *msg) switch (code) { case 0: - errorMessage = "Authentication failed"; + errorMessage = _("Authentication failed"); break; case 1: - errorMessage = "Map server(s) offline"; + errorMessage = _("Map server(s) offline"); break; case 2: - errorMessage = "This account is already logged in"; + errorMessage = _("This account is already logged in"); break; case 3: - errorMessage = "Speed hack detected"; + errorMessage = _("Speed hack detected"); break; case 8: - errorMessage = "Duplicated login"; + errorMessage = _("Duplicated login"); break; default: - errorMessage = "Unknown connection error"; + errorMessage = _("Unknown connection error"); break; } state = ERROR_STATE; break; - case 0x006b: - msg->skip(2); // Length word - flags = msg->readInt32(); // Aethyra extensions flags - logger->log("Server flags are: %x", flags); - extensions.aethyra_inventory = (bool)(flags & 0x01); - extensions.aethyra_spells = (bool)(flags & 0x02); - extensions.aethyra_misc = (bool)(flags & 0x04); - msg->skip(16); // Unused - - // Derive number of characters from message length - n_character = (msg->getLength() - 24) / 106; - - for (int i = 0; i < n_character; i++) - { - tempPlayer = readPlayerData(*msg, slot); - mCharInfo->select(slot); - mCharInfo->setEntry(tempPlayer); - logger->log("CharServer: Player: %s (%d)", - tempPlayer->getName().c_str(), slot); - } - - state = CHAR_SELECT_STATE; - break; - case 0x006c: switch (msg->readInt8()) { case 0: - errorMessage = "Access denied"; + errorMessage = _("Access denied"); break; case 1: - errorMessage = "Cannot use this ID"; + errorMessage = _("Cannot use this ID"); break; default: - errorMessage = "Unknown failure to select character"; + errorMessage = _("Unknown failure to select character"); break; } mCharInfo->unlock(); @@ -148,8 +119,8 @@ void CharServerHandler::handleMessage(MessageIn *msg) break; case 0x006e: - new OkDialog("Error", "Failed to create character. Most likely" - " the name is already taken."); + new OkDialog(_("Error"), _("Failed to create character. Most likely" + " the name is already taken.")); if (mCharCreateDialog) mCharCreateDialog->unlock(); @@ -160,12 +131,12 @@ void CharServerHandler::handleMessage(MessageIn *msg) mCharInfo->setEntry(0); mCharInfo->unlock(); n_character--; - new OkDialog("Info", "Player deleted"); + new OkDialog(_("Info"), _("Player deleted")); break; case 0x0070: mCharInfo->unlock(); - new OkDialog("Error", "Failed to delete character."); + new OkDialog(_("Error"), _("Failed to delete character.")); break; case 0x0071: |