Show
Ignore:
Timestamp:
11/22/08 00:36:29 (17 years ago)
Author:
yumileroy
Message:

Merge with 273 (aab191f73e46).

Original author: gvcoman
Date: 2008-11-21 19:16:19-05:00

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/src/game/Object.h

    r272 r281  
    456456        GameObject* SummonGameObject(uint32 entry, float x, float y, float z, float ang, float rotation0, float rotation1, float rotation2, float rotation3, uint32 respawnTime); 
    457457        bool isActive() const { return m_isActive; } 
    458         virtual void setActive(bool isActive); 
     458        void setActive(bool isActive); 
    459459    protected: 
    460460        explicit WorldObject();