*Merge.

--HG--
branch : trunk

1 files changed, 8 insertions, 8 deletions

diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp
index 8eb2a07b905..9eb19d90bc0 100644
--- a/src/game/Level3.cpp
+++ b/src/game/Level3.cpp
@@ -6502,22 +6502,22 @@ when attempting to use the PointMovementGenerator
 */
 bool ChatHandler::HandleComeToMeCommand(const char *args)
 {
-    Creature* caster = getSelectedCreature();
+    char* newFlagStr = strtok((char*)args, " ");
 
+    if(!newFlagStr)
+        return false;
+
+    uint32 newFlags = (uint32)strtoul(newFlagStr, NULL, 0);
+
+    Creature* caster = getSelectedCreature();
     if(!caster)
     {
+        m_session->GetPlayer()->SetUnitMovementFlags(newFlags);
         SendSysMessage(LANG_SELECT_CREATURE);
         SetSentErrorMessage(true);
         return false;
     }
 
-    char* newFlagStr = strtok((char*)args, " ");
-
-    if(!newFlagStr)
-        return false;
-
-    uint32 newFlags = atoi(newFlagStr);
-
     caster->SetUnitMovementFlags(newFlags);
 
     Player* pl = m_session->GetPlayer();