From 6e9542ca164716d6742163f32594e77128b559f6 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Sat, 28 Mar 2009 07:30:26 +0300 Subject: [PATCH] [7565] Move all hardcoded strings used in .account onlinelist to DB. Also update format as originally suggested by Cha0S2. --- sql/mangos.sql | 9 ++++++--- sql/updates/7565_01_mangos_mangos_string.sql | 9 +++++++++ sql/updates/Makefile.am | 2 ++ src/game/Language.h | 5 ++++- src/mangosd/CliRunnable.cpp | 11 +++++++---- src/shared/revision_nr.h | 2 +- 6 files changed, 29 insertions(+), 9 deletions(-) create mode 100644 sql/updates/7565_01_mangos_mangos_string.sql diff --git a/sql/mangos.sql b/sql/mangos.sql index cc36c0592..ea7894ebb 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -22,7 +22,7 @@ DROP TABLE IF EXISTS `db_version`; CREATE TABLE `db_version` ( `version` varchar(120) default NULL, - `required_7560_01_mangos_gameobject_template` bit(1) default NULL + `required_7565_01_mangos_mangos_string` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -2892,8 +2892,11 @@ INSERT INTO `mangos_string` VALUES (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 | TBC |',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(1011,'| | %20s | |||',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1010,'| Account | Character | IP | GM | Expansion |',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1011,'| | %20s | || |',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), +(1014,'No online players.',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/sql/updates/7565_01_mangos_mangos_string.sql b/sql/updates/7565_01_mangos_mangos_string.sql new file mode 100644 index 000000000..4557d1966 --- /dev/null +++ b/sql/updates/7565_01_mangos_mangos_string.sql @@ -0,0 +1,9 @@ +ALTER TABLE db_version CHANGE COLUMN required_7560_01_mangos_gameobject_template required_7565_01_mangos_mangos_string bit; + +DELETE FROM mangos_string WHERE entry IN(1010,1011,1012,1013,1014); +INSERT INTO mangos_string VALUES +(1010,'| Account | Character | IP | GM | Expansion |',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1011,'| | %20s | || |',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), +(1014,'No online players.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index f3cd4650a..e4af37ac1 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -209,6 +209,7 @@ pkgdata_DATA = \ 7558_01_mangos_mangos_string.sql \ 7558_02_mangos_command.sql \ 7560_01_mangos_gameobject_template.sql \ + 7565_01_mangos_mangos_string.sql \ README ## Additional files to include when running 'make dist' @@ -398,4 +399,5 @@ EXTRA_DIST = \ 7558_01_mangos_mangos_string.sql \ 7558_02_mangos_command.sql \ 7560_01_mangos_gameobject_template.sql \ + 7565_01_mangos_mangos_string.sql \ README diff --git a/src/game/Language.h b/src/game/Language.h index 7257dfd07..5aa4547f4 100644 --- a/src/game/Language.h +++ b/src/game/Language.h @@ -729,7 +729,10 @@ enum MangosStrings LANG_CHARACTER_DELETED = 1009, LANG_ACCOUNT_LIST_HEADER = 1010, LANG_ACCOUNT_LIST_ERROR = 1011, - // Room for more level 4 1012-1099 not used + LANG_ACCOUNT_LIST_BAR = 1012, + LANG_ACCOUNT_LIST_LINE = 1013, + LANG_ACCOUNT_LIST_EMPTY = 1014, + // Room for more level 4 1015-1099 not used // Level 3 (continue) LANG_ACCOUNT_SETADDON = 1100, diff --git a/src/mangosd/CliRunnable.cpp b/src/mangosd/CliRunnable.cpp index 7575b0dad..a1d20bbdf 100644 --- a/src/mangosd/CliRunnable.cpp +++ b/src/mangosd/CliRunnable.cpp @@ -166,12 +166,15 @@ bool ChatHandler::HandleAccountOnlineListCommand(const char* args) ///- Get the list of accounts ID logged to the realm QueryResult *resultDB = CharacterDatabase.Query("SELECT name,account FROM characters WHERE online > 0"); if (!resultDB) + { + SendSysMessage(LANG_ACCOUNT_LIST_EMPTY); return true; + } ///- Display the list of account/characters online - SendSysMessage("====================================================================="); + SendSysMessage(LANG_ACCOUNT_LIST_BAR); SendSysMessage(LANG_ACCOUNT_LIST_HEADER); - SendSysMessage("====================================================================="); + SendSysMessage(LANG_ACCOUNT_LIST_BAR); ///- Circle through accounts do @@ -188,7 +191,7 @@ bool ChatHandler::HandleAccountOnlineListCommand(const char* args) if(resultLogin) { Field *fieldsLogin = resultLogin->Fetch(); - PSendSysMessage("|%15s| %20s | %15s |%4d|%5d|", + PSendSysMessage(LANG_ACCOUNT_LIST_LINE, fieldsLogin[0].GetString(),name.c_str(),fieldsLogin[1].GetString(),fieldsLogin[2].GetUInt32(),fieldsLogin[3].GetUInt32()); delete resultLogin; @@ -200,7 +203,7 @@ bool ChatHandler::HandleAccountOnlineListCommand(const char* args) delete resultDB; - SendSysMessage("====================================================================="); + SendSysMessage(LANG_ACCOUNT_LIST_BAR); return true; } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index f1a629770..078a11e09 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7564" + #define REVISION_NR "7565" #endif // __REVISION_NR_H__