From ed6053e05cf2148941a4fecace43cf4b92813c35 Mon Sep 17 00:00:00 2001
From: Aokromes <aokromes@gmail.com>
Date: Sun, 22 Jul 2018 23:39:30 +0200
Subject: [PATCH] make travis happy

---
 sql/base/auth_database.sql                     | 3 ++-
 src/server/game/Entities/Creature/Creature.cpp | 2 +-
 src/server/game/Globals/ObjectMgr.cpp          | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index 8d4e3dcb282..4ed53d49dc4 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -1962,7 +1962,8 @@ INSERT INTO `updates` VALUES
 ('2018_05_15_00_auth.sql','9076B44013D5BE1E92A06BDE7CE4F9B6663272CC','ARCHIVED','2018-05-15 01:40:04',0),
 ('2018_06_15_00_auth.sql','28E2E814F529190BC9423E2A220970F60307DD22','ARCHIVED','2018-06-15 01:40:04',0),
 ('2018_06_23_00_auth.sql','BE35312C386A127D047E5A7CE0D14DB41D905F8E','ARCHIVED','2018-06-23 01:40:04',0),
-('2018_07_15_00_auth.sql','47DA80411544E574DD26BA2990165AC579BE72AB','ARCHIVED','2018-07-15 01:40:04',0);
+('2018_07_15_00_auth.sql','47DA80411544E574DD26BA2990165AC579BE72AB','ARCHIVED','2018-07-15 01:40:04',0),
+('2018_07_21_00_auth.sql','93185DC1BCA6A0225EA4CC4ACB1BA26F089E8131','ARCHIVED','2018-07-21 01:40:04',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 6419fdff1f5..a92ae3e960d 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -916,7 +916,7 @@ void Creature::Motion_Initialize()
         GetMotionMaster()->Initialize();
 }
 
-bool Creature::Create(ObjectGuid::LowType guidlow, Map* map, uint32 phaseMask, uint32 entry, Position const& pos, CreatureData const* data /*= nullptr*/, uint32 vehId /*= 0*/, bool dynamic)
+bool Creature::Create(ObjectGuid::LowType guidlow, Map* map, uint32 /*phaseMask*/, uint32 entry, Position const& pos, CreatureData const* data /*= nullptr*/, uint32 vehId /*= 0*/, bool dynamic)
 {
     ASSERT(map);
     SetMap(map);
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 5a1f1bf8f0d..c4f970117c3 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -2008,7 +2008,7 @@ void ObjectMgr::LoadCreatures()
                 TC_LOG_ERROR("sql.sql", "Table `creature` have creature (GUID: %u Entry: %u) with `terrainSwapMap` %u does not exist, set to -1", guid, data.id, data.terrainSwapMap);
                 data.terrainSwapMap = -1;
             }
-            else if (terrainSwapEntry->rootPhaseMap != data.spawnPoint.GetMapId())
+            else if (terrainSwapEntry->rootPhaseMap != int32(data.spawnPoint.GetMapId()))
             {
                 TC_LOG_ERROR("sql.sql", "Table `creature` have creature (GUID: %u Entry: %u) with `terrainSwapMap` %u which cannot be used on spawn map, set to -1", guid, data.id, data.terrainSwapMap);
                 data.terrainSwapMap = -1;
@@ -2314,7 +2314,7 @@ void ObjectMgr::LoadGameObjects()
                 TC_LOG_ERROR("sql.sql", "Table `gameobject` have gameobject (GUID: %u Entry: %u) with `terrainSwapMap` %u does not exist, set to -1", guid, data.id, data.terrainSwapMap);
                 data.terrainSwapMap = -1;
             }
-            else if (terrainSwapEntry->rootPhaseMap != data.spawnPoint.GetMapId())
+            else if (terrainSwapEntry->rootPhaseMap != int32(data.spawnPoint.GetMapId()))
             {
                 TC_LOG_ERROR("sql.sql", "Table `gameobject` have gameobject (GUID: %u Entry: %u) with `terrainSwapMap` %u which cannot be used on spawn map, set to -1", guid, data.id, data.terrainSwapMap);
                 data.terrainSwapMap = -1;