Merge from master

This commit is contained in:
KimLS
2015-07-15 23:15:25 -07:00
95 changed files with 25778 additions and 6435 deletions
+4 -4
View File
@@ -1931,10 +1931,10 @@ bool WorldServer::SendChannelMessage(Client* from, const char* to, uint8 chan_nu
bool WorldServer::SendEmoteMessage(const char* to, uint32 to_guilddbid, uint32 type, const char* message, ...) {
va_list argptr;
char buffer[256];
char buffer[4096] = { 0 };
va_start(argptr, message);
vsnprintf(buffer, 256, message, argptr);
vsnprintf(buffer, sizeof(buffer) - 1, message, argptr);
va_end(argptr);
return SendEmoteMessage(to, to_guilddbid, 0, type, buffer);
@@ -1942,10 +1942,10 @@ bool WorldServer::SendEmoteMessage(const char* to, uint32 to_guilddbid, uint32 t
bool WorldServer::SendEmoteMessage(const char* to, uint32 to_guilddbid, int16 to_minstatus, uint32 type, const char* message, ...) {
va_list argptr;
char buffer[256];
char buffer[4096] = { 0 };
va_start(argptr, message);
vsnprintf(buffer, 256, message, argptr);
vsnprintf(buffer, sizeof(buffer) - 1, message, argptr);
va_end(argptr);
if (!Connected() && to == 0) {