Merge remote-tracking branch 'origin/master' into mmaps

1 files changed, 5 insertions, 5 deletions

diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
index 1778dc9be67..aaa4d1c3f68 100644
--- a/src/server/scripts/Commands/cs_misc.cpp
+++ b/src/server/scripts/Commands/cs_misc.cpp
@@ -953,8 +953,8 @@ public:
         if (!player_str)
             return false;
 
-        char* location_str = strtok(NULL, "");
-        if (!location_str)
+        std::string location_str = strtok(NULL, "");
+        if (location_str.empty())
             location_str = "inn";
 
         Player* player = NULL;
@@ -969,19 +969,19 @@ public:
             return false;
         }
 
-        if (!stricmp(location_str, "inn"))
+        if (location_str == "inn")
         {
             player->TeleportTo(player->m_homebindMapId, player->m_homebindX, player->m_homebindY, player->m_homebindZ, player->GetOrientation());
             return true;
         }
 
-        if (!stricmp(location_str, "graveyard"))
+        if (location_str == "graveyard")
         {
             player->RepopAtGraveyard();
             return true;
         }
 
-        if (!stricmp(location_str, "startzone"))
+        if (location_str == "startzone")
         {
             player->TeleportTo(player->GetStartPosition());
             return true;