diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-02 14:41:33 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-02 14:41:33 +0200 |
| commit | 39cce3344c43d183ac855d9acfad83341d4d6335 (patch) | |
| tree | 44d1db22be5750026ab3b835bec56236cda5abf1 /src/server/game/Chat/Chat.cpp | |
| parent | 5b0cd048103e8ebf9620be06a30d1bcf0e901dd6 (diff) | |
| parent | 5ae86ee2a85923ed09b8b719ef98de759d22e0e8 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
Diffstat (limited to 'src/server/game/Chat/Chat.cpp')
| -rw-r--r-- | src/server/game/Chat/Chat.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index 1515c75597f..505d00dc5f6 100644 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -80,8 +80,8 @@ ChatCommand* ChatHandler::getCommandTable() // cache top-level commands size_t added = 0; commandTableCache = (ChatCommand*)malloc(sizeof(ChatCommand) * total); + ASSERT(commandTableCache); memset(commandTableCache, 0, sizeof(ChatCommand) * total); - ACE_ASSERT(commandTableCache); for (std::vector<ChatCommand*>::const_iterator it = dynamic.begin(); it != dynamic.end(); ++it) added += appendCommandTable(commandTableCache + added, *it); } |