From 93e06f945ee8f64a3230ecd3af72e78a98512cbc Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Fri, 9 Jul 2010 22:40:01 +0400 Subject: [PATCH] [10171] Clarify acoount password/lock command errors. --- sql/mangos.sql | 5 +++-- sql/updates/10171_01_mangos_mangos_string.sql | 7 +++++++ sql/updates/Makefile.am | 2 ++ src/game/Language.h | 3 ++- src/game/Level0.cpp | 8 ++++++++ src/game/QuestDef.cpp | 2 +- src/shared/revision_nr.h | 2 +- src/shared/revision_sql.h | 2 +- 8 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 sql/updates/10171_01_mangos_mangos_string.sql diff --git a/sql/mangos.sql b/sql/mangos.sql index 90d4268db..f0120438c 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -24,7 +24,7 @@ CREATE TABLE `db_version` ( `version` varchar(120) default NULL, `creature_ai_version` varchar(120) default NULL, `cache_id` int(10) default '0', - `required_10159_01_mangos_spell_proc_event` bit(1) default NULL + `required_10171_01_mangos_mangos_string` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -3017,7 +3017,7 @@ INSERT INTO `mangos_string` VALUES (24,'You used it recently.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (25,'Password not changed (unknown error)!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (26,'The password was changed',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(27,'The new passwords do not match or the old password is wrong',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(27,'The old password is wrong',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (28,'Your account is now locked.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (29,'Your account is now unlocked.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (30,', rank ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), @@ -3660,6 +3660,7 @@ INSERT INTO `mangos_string` VALUES (1026,'GUID: %u Name: %s Account: %s (%u) Date: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (1027,'Log filters state:',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (1028,'All log filters set to: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1029, 'Command can be called only from RA-console.',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/10171_01_mangos_mangos_string.sql b/sql/updates/10171_01_mangos_mangos_string.sql new file mode 100644 index 000000000..2d4f63c20 --- /dev/null +++ b/sql/updates/10171_01_mangos_mangos_string.sql @@ -0,0 +1,7 @@ +ALTER TABLE db_version CHANGE COLUMN required_10159_01_mangos_spell_proc_event required_10171_01_mangos_mangos_string bit; + +DELETE FROM mangos_string WHERE entry IN (27,1029); + +INSERT INTO mangos_string VALUES +(27,'The old password is wrong',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1029, 'Command can be called only from RA-console.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index 2e368d8bd..f896f7566 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -105,6 +105,7 @@ pkgdata_DATA = \ 10159_01_mangos_spell_proc_event.sql \ 10160_01_characters_character_aura.sql \ 10160_02_characters_pet_aura.sql \ + 10171_01_mangos_mangos_string.sql \ README ## Additional files to include when running 'make dist' @@ -190,4 +191,5 @@ EXTRA_DIST = \ 10159_01_mangos_spell_proc_event.sql \ 10160_01_characters_character_aura.sql \ 10160_02_characters_pet_aura.sql \ + 10171_01_mangos_mangos_string.sql \ README diff --git a/src/game/Language.h b/src/game/Language.h index 234562f6a..9ddab47c7 100644 --- a/src/game/Language.h +++ b/src/game/Language.h @@ -796,7 +796,8 @@ enum MangosStrings LANG_CHARACTER_DELETED_LIST_LINE_CHAT = 1026, LANG_LOG_FILTERS_STATE_HEADER = 1027, LANG_ALL_LOG_FILTERS_SET_TO_S = 1028, - // Room for more level 4 1029-1099 not used + LANG_RA_ONLY_COMMAND = 1029, + // Room for more level 4 1030-1099 not used // Level 3 (continue) LANG_ACCOUNT_SETADDON = 1100, diff --git a/src/game/Level0.cpp b/src/game/Level0.cpp index 00c6b6ec1..b0bda54f5 100644 --- a/src/game/Level0.cpp +++ b/src/game/Level0.cpp @@ -184,7 +184,11 @@ bool ChatHandler::HandleAccountPasswordCommand(const char* args) { // allow use from RA, but not from console (not have associated account id) if (!GetAccountId()) + { + SendSysMessage (LANG_RA_ONLY_COMMAND); + SetSentErrorMessage (true); return false; + } if(!*args) return false; @@ -239,7 +243,11 @@ bool ChatHandler::HandleAccountLockCommand(const char* args) { // allow use from RA, but not from console (not have associated account id) if (!GetAccountId()) + { + SendSysMessage (LANG_RA_ONLY_COMMAND); + SetSentErrorMessage (true); return false; + } if (!*args) { diff --git a/src/game/QuestDef.cpp b/src/game/QuestDef.cpp index 2e60bb60d..e2d86ca86 100644 --- a/src/game/QuestDef.cpp +++ b/src/game/QuestDef.cpp @@ -269,4 +269,4 @@ bool Quest::IsAllowedInRaid() const return true; return sWorld.getConfig(CONFIG_BOOL_QUEST_IGNORE_RAID); -} \ No newline at end of file +} diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 78117e66b..6b0aa96b8 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 "10170" + #define REVISION_NR "10171" #endif // __REVISION_NR_H__ diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h index 7e8df8e3f..c94fd503f 100644 --- a/src/shared/revision_sql.h +++ b/src/shared/revision_sql.h @@ -1,6 +1,6 @@ #ifndef __REVISION_SQL_H__ #define __REVISION_SQL_H__ #define REVISION_DB_CHARACTERS "required_10160_02_characters_pet_aura" - #define REVISION_DB_MANGOS "required_10159_01_mangos_spell_proc_event" + #define REVISION_DB_MANGOS "required_10171_01_mangos_mangos_string" #define REVISION_DB_REALMD "required_10008_01_realmd_realmd_db_version" #endif // __REVISION_SQL_H__