diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-11 18:37:31 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-11 18:37:31 +0200 |
| commit | f506ee3077a5a8c86d3a02ab06c1c3e91b7d8d7e (patch) | |
| tree | f0844a12facac7cd7a94c47cbab56d2bb55962a4 /src/server/scripts/Commands | |
| parent | fa0aaa5fa4ed93992e54cce411944e41d1fd831d (diff) | |
| parent | eefdceea71135c6b281d181233da04159e63b179 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.h
src/server/game/Spells/SpellMgr.cpp
Diffstat (limited to 'src/server/scripts/Commands')
| -rw-r--r-- | src/server/scripts/Commands/cs_debug.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index da9aa9eccb3..6ef84033312 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -506,7 +506,7 @@ public: static bool HandleDebugSendQuestInvalidMsgCommand(ChatHandler* handler, char const* args) { - uint32 msg = atol((char*)args); + QuestFailedReason msg = static_cast<QuestFailedReason>(atol((char*)args)); handler->GetSession()->GetPlayer()->SendCanTakeQuestResponse(msg); return true; } |