diff options
| -rw-r--r-- | sql/updates/7548_world_trinity_string.sql | 6 | ||||
| -rw-r--r-- | sql/world.sql | 7 | ||||
| -rw-r--r-- | src/game/Language.h | 3 | ||||
| -rw-r--r-- | src/trinitycore/CliRunnable.cpp | 6 |
4 files changed, 15 insertions, 7 deletions
diff --git a/sql/updates/7548_world_trinity_string.sql b/sql/updates/7548_world_trinity_string.sql new file mode 100644 index 00000000000..5d6165f2125 --- /dev/null +++ b/sql/updates/7548_world_trinity_string.sql @@ -0,0 +1,6 @@ +DELETE FROM `trinity_string` WHERE `entry` in (1010,1012,1013,1015); +INSERT INTO `trinity_string` (`entry`, `content_default`) VALUES +(1010, '[ Account][ Character][ IP][GMLev][Expansion][Map][Zone]'), +(1012, '=============================================================================='), +(1013, '-[%16s][%12s][%15s][%5d][%9d][%3d][%4d]'), +(1015, '============================== Characters Online =============================');
\ No newline at end of file diff --git a/sql/world.sql b/sql/world.sql index 805e76841fb..f4812fa3498 100644 --- a/sql/world.sql +++ b/sql/world.sql @@ -14680,11 +14680,12 @@ INSERT INTO `trinity_string` (`entry`,`content_default`,`content_loc1`,`content_ (1007, 'Account %s NOT created (probably sql file format was updated)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (1008, 'Account %s NOT created (unknown error)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (1009, 'Player %s (Guid: %u) Account %s (Id: %u) deleted.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), -(1010, '| Account | Character | IP | GM | Expansion |', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(1010, '[ Account][ Character][ IP][GMLev][Expansion][Map][Zone]', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (1011, '|<Error> | %20s |<Error> |<Er>| <Error> |', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), -(1012, '===========================================================================', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), -(1013, '|%15s| %20s | %15s |%4d| %9d |', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(1012, '==============================================================================', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(1013, '-[%16s][%12s][%15s][%5d][%9d][%3d][%4d]', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (1014, 'No online players.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(1015, '============================== Characters Online =============================', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (1100, 'Account %s (Id: %u) have up to %u expansion allowed now.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (1101, 'Message of the day changed to:\r\n%s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (1102, 'Message sent to %s: %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), diff --git a/src/game/Language.h b/src/game/Language.h index c4459c18c71..8782ab9d37d 100644 --- a/src/game/Language.h +++ b/src/game/Language.h @@ -743,7 +743,8 @@ enum TrinityStrings LANG_ACCOUNT_LIST_BAR = 1012, LANG_ACCOUNT_LIST_LINE = 1013, LANG_ACCOUNT_LIST_EMPTY = 1014, - // Room for more level 4 1015-1099 not used + LANG_ACCOUNT_LIST_BAR_HEADER = 1015, + // Room for more level 4 1016-1099 not used // Level 3 (continue) LANG_ACCOUNT_SETADDON = 1100, diff --git a/src/trinitycore/CliRunnable.cpp b/src/trinitycore/CliRunnable.cpp index f1a24d09d99..c26302d30cd 100644 --- a/src/trinitycore/CliRunnable.cpp +++ b/src/trinitycore/CliRunnable.cpp @@ -219,7 +219,7 @@ bool ChatHandler::HandleServerExitCommand(const char* /*args*/) bool ChatHandler::HandleAccountOnlineListCommand(const char* /*args*/) { ///- Get the list of accounts ID logged to the realm - QueryResult_AutoPtr resultDB = CharacterDatabase.Query("SELECT name,account FROM characters WHERE online > 0"); + QueryResult_AutoPtr resultDB = CharacterDatabase.Query("SELECT name,account,map,zone FROM characters LEFTWHERE online > 0"); if (!resultDB) { SendSysMessage(LANG_ACCOUNT_LIST_EMPTY); @@ -227,7 +227,7 @@ bool ChatHandler::HandleAccountOnlineListCommand(const char* /*args*/) } ///- Display the list of account/characters online - SendSysMessage(LANG_ACCOUNT_LIST_BAR); + SendSysMessage(LANG_ACCOUNT_LIST_BAR_HEADER); SendSysMessage(LANG_ACCOUNT_LIST_HEADER); SendSysMessage(LANG_ACCOUNT_LIST_BAR); @@ -250,7 +250,7 @@ bool ChatHandler::HandleAccountOnlineListCommand(const char* /*args*/) { Field *fieldsLogin = resultLogin->Fetch(); PSendSysMessage(LANG_ACCOUNT_LIST_LINE, - fieldsLogin[0].GetString(),name.c_str(),fieldsLogin[1].GetString(),fieldsLogin[2].GetUInt32(),fieldsLogin[3].GetUInt32()); + fieldsLogin[0].GetString(),name.c_str(),fieldsLogin[1].GetString(),fieldsLogin[2].GetUInt32(),fieldsLogin[3].GetUInt32(),fieldsDB[2].GetInt32(),fieldsDB[3].GetInt32()); } else PSendSysMessage(LANG_ACCOUNT_LIST_ERROR,name.c_str()); |