From fb05143311bea2c47fd847bbac0b20933485ebf0 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Fri, 20 Feb 2009 19:54:51 +0300 Subject: [PATCH] [7309] Allow creatures has been visible in 2 or more phases as expected for some creature. --- src/game/ObjectMgr.cpp | 29 +---------------------------- src/shared/revision_nr.h | 2 +- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 3197f221f..135270ffe 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -965,37 +965,10 @@ void ObjectMgr::LoadCreatures() sLog.outErrorDb("Table `creature` have creature (GUID: %u Entry: %u) with `phaseMask`=0 (not visible for anyone), set to 1.",guid,data.id ); data.phaseMask = 1; } - else - { - int count = 0; - for(int i=0; i < sizeof(data.phaseMask)*8; ++i) - if(data.phaseMask & (1 << i)) - ++count; - - if(count > 1) - { - uint32 phaseMask = data.phaseMask & ~PHASEMASK_NORMAL; - count = 0; - for(int i=0; i < sizeof(phaseMask)*8; ++i) - if(phaseMask & (1 << i)) - ++count; - - if(count > 1) - { - sLog.outErrorDb("Table `creature` have creature (GUID: %u Entry: %u) with more single bit set in `phaseMask` (not visible for anyone), set to 1.",guid,data.id ); - data.phaseMask = phaseMask; - } - else - { - sLog.outErrorDb("Table `creature` have creature (GUID: %u Entry: %u) with more single bit set in `phaseMask` (not visible for anyone), set to %u (possible expected).",guid,data.id,phaseMask); - data.phaseMask = 1; - } - - } - } if (gameEvent==0 && PoolId==0) // if not this is to be managed by GameEvent System or Pool system AddCreatureToGrid(guid, &data); + ++count; } while (result->NextRow()); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index e96791f83..a61bba635 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7308" + #define REVISION_NR "7309" #endif // __REVISION_NR_H__