diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-05 17:01:46 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-05 17:01:46 +0100 |
| commit | d5163d846fcbbd94655f0ba93c81a3e2bd302b3c (patch) | |
| tree | 7b1cdcfb0d21e9c7406281b72189f9ace290718d /src/server/game/Globals/ObjectMgr.cpp | |
| parent | f6b6558814b4f5da7b6928e156ae84f4d6a94bb6 (diff) | |
| parent | 7dd0cd4403d7f28343a751e7b85aeb30d3968ff5 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/AI/EventAI/CreatureEventAI.h
src/server/game/Achievements/AchievementMgr.cpp
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index b5340164028..6e659cb9f02 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -117,7 +117,7 @@ std::string GetScriptCommandName(ScriptCommands command) default: { char sz[32]; - sprintf(sz, "Unknown command: %u", command); + sprintf(sz, "Unknown command: %d", command); res = sz; break; } |