mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 07:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11513] Not pass command list as format %s value.

Browse source 
This let avoid not nice command list text length limitation.

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
Vinolentus 2011-05-20 23:11:59 +04:00 • committed by VladimirMangos
parent 8022cef6a7
commit 19ff7f0a8b
5 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sql/mangos.sql
View file

@ -24,7 +24,7 @@ CREATE TABLE `db_version` (
`version` varchar(120) default NULL, `version` varchar(120) default NULL,
`creature_ai_version` varchar(120) default NULL, `creature_ai_version` varchar(120) default NULL,
`cache_id` int(10) default '0', `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'; ) 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), (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), (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), (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), (9,'Commands available to you:',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(10,'Incorrect syntax.',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), (11,'Your account level is: %i',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),

5
sql/updates/11513_09_mangos_mangos_string.sql Normal file
View file

@ -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);

16
src/game/Chat.cpp
View file

@ -946,7 +946,7 @@ void ChatHandler::PSendSysMessage(int32 entry, ...)
va_list ap; va_list ap;
char str [2048]; char str [2048];
va_start(ap, entry); va_start(ap, entry);
vsnprintf(str,2048,format, ap ); vsnprintf(str, 2048, format, ap);
va_end(ap); va_end(ap);
SendSysMessage(str); SendSysMessage(str);
} }
@ -956,7 +956,7 @@ void ChatHandler::PSendSysMessage(const char *format, ...)
va_list ap; va_list ap;
char str [2048]; char str [2048];
va_start(ap, format); va_start(ap, format);
vsnprintf(str,2048,format, ap ); vsnprintf(str, 2048, format, ap);
va_end(ap); va_end(ap);
SendSysMessage(str); SendSysMessage(str);
} }
@ -1311,7 +1311,7 @@ bool ChatHandler::ParseCommands(const char* text)
bool ChatHandler::ShowHelpForSubCommands(ChatCommand *table, char const* cmd) bool ChatHandler::ShowHelpForSubCommands(ChatCommand *table, char const* cmd)
{ {
std::string list; 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 // must be available (ignore handler existence for show command with possible available subcommands
if (!isAvailable(table[i])) if (!isAvailable(table[i]))
@ -1331,14 +1331,16 @@ bool ChatHandler::ShowHelpForSubCommands(ChatCommand *table, char const* cmd)
if (list.empty()) if (list.empty())
return false; return false;
if (table==getCommandTable()) if (table == getCommandTable())
{ {
SendSysMessage(LANG_AVIABLE_CMD); SendSysMessage(LANG_AVIABLE_CMD);
PSendSysMessage("%s",list.c_str()); SendSysMessage(list.c_str());
} }
else else
PSendSysMessage(LANG_SUBCMDS_LIST,cmd,list.c_str()); {
PSendSysMessage(LANG_SUBCMDS_LIST, cmd);
SendSysMessage(list.c_str());
}
return true; return true;
} }

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11512" #define REVISION_NR "11513"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__

2
src/shared/revision_sql.h
View file

@ -1,6 +1,6 @@
#ifndef __REVISION_SQL_H__ #ifndef __REVISION_SQL_H__
#define __REVISION_SQL_H__ #define __REVISION_SQL_H__
#define REVISION_DB_CHARACTERS "required_11436_01_characters_character_queststatus" #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" #define REVISION_DB_REALMD "required_10008_01_realmd_realmd_db_version"
#endif // __REVISION_SQL_H__ #endif // __REVISION_SQL_H__