Permalink
Browse files

missing changes from my prev. commit

  • Loading branch information...
SilverIce committed Oct 13, 2011
1 parent 0b69f80 commit e92b597712504ab45f793d92c4da8a6889affb1c
Showing with 3 additions and 1 deletion.
  1. +3 −1 src/game/Object.cpp
View
@@ -1885,7 +1885,9 @@ void WorldObject::SetActiveObjectState(bool active)
if (m_isActiveObject == active || (isType(TYPEMASK_PLAYER) && !active)) // player shouldn't became inactive, never
return;
- if (IsInWorld())
+ if (IsInWorld() && !isType(TYPEMASK_PLAYER))
+ // player's update implemented in a different from other active worldobject's way
+ // it's considired to use generic way in future
{
if (isActiveObject() && !active)
GetMap()->RemoveFromActive(this);

0 comments on commit e92b597

Please sign in to comment.