Allow map objects as warp targets

This patch allows map objects as warp targets.
For use:
 - Create object in tiled with type="WARP_DEST"
 - Set name to anything you want
 - Create usual WARP object
 - Leave out the DEST_{X,Y} part
 - Add DEST_NAME property with the name of the first object

This requires the game server to parse all maps at startup.

Change is tested.

Reviewed-by: bjorn.

1 files changed, 4 insertions, 1 deletions

diff --git a/src/game-server/mapcomposite.h b/src/game-server/mapcomposite.h
index 079e5e48..d61f8ce6 100644
--- a/src/game-server/mapcomposite.h
+++ b/src/game-server/mapcomposite.h
@@ -234,6 +234,8 @@ class MapComposite
         MapComposite(int id, const std::string &name);
         ~MapComposite();
 
+        bool readMap();
+
         /**
          * Loads the map and initializes the map content. Should only be called
          * once!
@@ -253,7 +255,7 @@ class MapComposite
          * Returns whether the map is active on this server or not.
          */
         bool isActive() const
-        { return mMap; }
+        { return mActive; }
 
         /**
          * Gets the game ID of this map.
@@ -366,6 +368,7 @@ class MapComposite
         void callMapVariableCallback(const std::string &key,
                                      const std::string &value);
 
+        bool mActive;         /**< Status of map. */
         Map *mMap;            /**< Actual map. */
         MapContent *mContent; /**< Entities on the map. */
         std::string mName;    /**< Name of the map. */