diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-05-01 16:43:19 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-05-01 16:43:19 +0200 |
| commit | b583a68672cc6c53d24c89854e35bb5f3f0c5b65 (patch) | |
| tree | 84ebe4b13246cf315d770e19caaa54a18100977d /src | |
| parent | 8a5c4cae407e53d66ca4dec6be88e2c53527484a (diff) | |
Warning fix
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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. |