From b583a68672cc6c53d24c89854e35bb5f3f0c5b65 Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 1 May 2015 16:43:19 +0200 Subject: Warning fix --- src/server/game/Entities/Player/Player.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index c23d0988fb8..ead61865fe7 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -2090,8 +2090,8 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati // Seamless teleport can happen only if cosmetic maps match if (!oldmap || - (oldmap->GetEntry()->CosmeticParentMapID != mapid && GetMapId() != mEntry->CosmeticParentMapID && - !(oldmap->GetEntry()->CosmeticParentMapID != -1 ^ oldmap->GetEntry()->CosmeticParentMapID != mEntry->CosmeticParentMapID))) + (oldmap->GetEntry()->CosmeticParentMapID != int32(mapid) && int32(GetMapId()) != mEntry->CosmeticParentMapID && + !((oldmap->GetEntry()->CosmeticParentMapID != -1) ^ (oldmap->GetEntry()->CosmeticParentMapID != mEntry->CosmeticParentMapID)))) options &= ~TELE_TO_SEAMLESS; //I think this always returns true. Correct me if I am wrong. -- cgit v1.2.3