Changeset 272 for trunk/src/game/Map.h

Timestamp:

11/22/08 00:35:41 (17 years ago)

Author:

yumileroy

Message:

Delete possessed AI only on creature delete.

Original author: gvcoman
Date: 2008-11-16 14:38:02-05:00

Files:

• trunk/src/game/Map.h (modified) (13 diffs)

trunk/src/game/Map.h

@@ -11 +11 @@
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
@@ -34 +34 @@
 #include "SharedDefines.h"
 #include "GameSystem/GridRefManager.h"
-#include "MapRefManager.h"
 
 #include <bitset>
@@ -106 +105 @@
     float startLocZ;
     float startLocO;
-    uint32 script_id;
+    char const* script;
 };
 
@@ -128 +127 @@
 class TRINITY_DLL_SPEC Map : public GridRefManager<NGridType>, public Trinity::ObjectLevelLockable<Map, ZThread::Mutex>
 {
-    friend class MapReference;
     public:
         Map(uint32 id, time_t, uint32 InstanceId, uint8 SpawnMode);
@@ -240 +238 @@
         GameObject* GetGameObjectInMap(uint64 guid);
 
-        bool HavePlayers() const { return !m_mapRefManager.isEmpty(); }
-        uint32 GetPlayersCountExceptGMs() const;
-        bool PlayersNearGrid(uint32 x,uint32 y) const;
-        bool ActiveObjectsNearGrid(uint32 x, uint32 y) const;
-
-        void AddActiveObject(WorldObject* obj) { i_activeObjects.insert(obj); }
-        void RemoveActiveObject(WorldObject* obj) { i_activeObjects.erase(obj); }
-
-        void SendToPlayers(WorldPacket const* data) const;
-
-        typedef MapRefManager PlayerList;
-        PlayerList const& GetPlayers() const { return m_mapRefManager; }
         template<class T> void SwitchGridContainers(T* obj, bool active);
     private:
@@ -292 +278 @@
         inline void setNGrid(NGridType* grid, uint32 x, uint32 y);
 
-        void UpdateActiveCells(const float &x, const float &y, const uint32 &t_diff);
     protected:
         typedef Trinity::ObjectLevelLockable<Map, ZThread::Mutex>::Lock Guard;
@@ -302 +287 @@
         uint32 m_unloadTimer;
 
-        MapRefManager m_mapRefManager;
     private:
         typedef GridReadGuard ReadGuard;
@@ -313 +297 @@
         time_t i_gridExpiry;
 
-        std::set<WorldObject *> i_activeObjects;
         std::set<WorldObject *> i_objectsToRemove;
 
@@ -343 +326 @@
 {
     public:
+        typedef std::list<Player *> PlayerList;                 // online players only
+
         InstanceMap(uint32 id, time_t, uint32 InstanceId, uint8 SpawnMode);
         ~InstanceMap();
@@ -350 +335 @@
         void CreateInstanceData(bool load);
         bool Reset(uint8 method);
-        uint32 GetScriptId() { return i_script_id; }
+        std::string GetScript() { return i_script; }
         InstanceData* GetInstanceData() { return i_data; }
         void PermBindAllPlayers(Player *player);
+        PlayerList const& GetPlayers() const { return i_Players;}
+        void SendToPlayers(WorldPacket const* data) const;
         time_t GetResetTime();
         void UnloadAll(bool pForce);
         bool CanEnter(Player* player);
-        void SendResetWarnings(uint32 timeLeft) const;
+        uint32 GetPlayersCountExceptGMs() const;
+        uint32 HavePlayers() const { return !i_Players.empty(); }
+        void SendResetWarnings(uint32 timeLeft);
         void SetResetSchedule(bool on);
     private:
@@ -362 +351 @@
         bool m_unloadWhenEmpty;
         InstanceData* i_data;
-        uint32 i_script_id;
+        std::string i_script;
+        // only online players that are inside the instance currently
+        // TODO ? - use the grid instead to access the players
+        PlayerList i_Players;
 };
 
@@ -368 +360 @@
 {
     public:
+        typedef std::list<Player *> PlayerList;                 // online players only
+
         BattleGroundMap(uint32 id, time_t, uint32 InstanceId);
         ~BattleGroundMap();
@@ -376 +370 @@
         void SetUnload();
         void UnloadAll(bool pForce);
+    private:
+        PlayerList i_Players;
 };