From 19ff7f0a8bffe7a36b65b9c6b59d99b7a2c2c125 Mon Sep 17 00:00:00 2001
From: Vinolentus <Vinolentus@getmangos.com>
Date: Fri, 20 May 2011 23:11:59 +0400
Subject: [PATCH] [11513] Not pass command list as format %s value.

This let avoid not nice command list text length limitation.

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
---
 sql/mangos.sql                                |  4 ++--
 sql/updates/11513_09_mangos_mangos_string.sql |  5 +++++
 src/game/Chat.cpp                             | 16 +++++++++-------
 src/shared/revision_nr.h                      |  2 +-
 src/shared/revision_sql.h                     |  2 +-
 5 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 sql/updates/11513_09_mangos_mangos_string.sql

diff --git a/sql/mangos.sql b/sql/mangos.sql
index 47a61a1a5..347e3ed35 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_11503_01_mangos_spell_proc_event` bit(1) default NULL
+  `required_11513_09_mangos_mangos_string` bit(1) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
 
 --
@@ -3083,7 +3083,7 @@ INSERT INTO `mangos_string` VALUES
 (5,'There is no help for that command',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (6,'There is no such command',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (7,'There is no such subcommand',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
-(8,'Command %s have subcommands:%s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(8,'Command %s have subcommands:',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (9,'Commands available to you:',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (10,'Incorrect syntax.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (11,'Your account level is: %i',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
diff --git a/sql/updates/11513_09_mangos_mangos_string.sql b/sql/updates/11513_09_mangos_mangos_string.sql
new file mode 100644
index 000000000..894ecaf7c
--- /dev/null
+++ b/sql/updates/11513_09_mangos_mangos_string.sql
@@ -0,0 +1,5 @@
+ALTER TABLE db_version CHANGE COLUMN required_11503_01_mangos_spell_proc_event required_11513_09_mangos_mangos_string bit;
+
+DELETE FROM mangos_string WHERE entry IN (8);
+INSERT INTO mangos_string VALUES
+(8,'Command %s have subcommands:',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp
index 19a878680..767e69a57 100644
--- a/src/game/Chat.cpp
+++ b/src/game/Chat.cpp
@@ -946,7 +946,7 @@ void ChatHandler::PSendSysMessage(int32 entry, ...)
     va_list ap;
     char str [2048];
     va_start(ap, entry);
-    vsnprintf(str,2048,format, ap );
+    vsnprintf(str, 2048, format, ap);
     va_end(ap);
     SendSysMessage(str);
 }
@@ -956,7 +956,7 @@ void ChatHandler::PSendSysMessage(const char *format, ...)
     va_list ap;
     char str [2048];
     va_start(ap, format);
-    vsnprintf(str,2048,format, ap );
+    vsnprintf(str, 2048, format, ap);
     va_end(ap);
     SendSysMessage(str);
 }
@@ -1311,7 +1311,7 @@ bool ChatHandler::ParseCommands(const char* text)
 bool ChatHandler::ShowHelpForSubCommands(ChatCommand *table, char const* cmd)
 {
     std::string list;
-    for(uint32 i = 0; table[i].Name != NULL; ++i)
+    for (uint32 i = 0; table[i].Name != NULL; ++i)
     {
         // must be available (ignore handler existence for show command with possible available subcommands
         if (!isAvailable(table[i]))
@@ -1331,14 +1331,16 @@ bool ChatHandler::ShowHelpForSubCommands(ChatCommand *table, char const* cmd)
     if (list.empty())
         return false;
 
-    if (table==getCommandTable())
+    if (table == getCommandTable())
     {
         SendSysMessage(LANG_AVIABLE_CMD);
-        PSendSysMessage("%s",list.c_str());
+        SendSysMessage(list.c_str());
     }
     else
-        PSendSysMessage(LANG_SUBCMDS_LIST,cmd,list.c_str());
-
+    {
+        PSendSysMessage(LANG_SUBCMDS_LIST, cmd);
+        SendSysMessage(list.c_str());
+    }
     return true;
 }
 
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index f12540a6e..b2836291e 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 "11512"
+ #define REVISION_NR "11513"
 #endif // __REVISION_NR_H__
diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h
index b57ffb31d..30f61aa35 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_11436_01_characters_character_queststatus"
- #define REVISION_DB_MANGOS "required_11503_01_mangos_spell_proc_event"
+ #define REVISION_DB_MANGOS "required_11513_09_mangos_mangos_string"
  #define REVISION_DB_REALMD "required_10008_01_realmd_realmd_db_version"
 #endif // __REVISION_SQL_H__