aboutsummaryrefslogtreecommitdiff
path: root/engines/gob/map.h
diff options
context:
space:
mode:
Diffstat (limited to 'engines/gob/map.h')
-rw-r--r--engines/gob/map.h40
1 files changed, 26 insertions, 14 deletions
diff --git a/engines/gob/map.h b/engines/gob/map.h
index f8e16210ee..4866b9b7f8 100644
--- a/engines/gob/map.h
+++ b/engines/gob/map.h
@@ -72,23 +72,9 @@ struct ItemPos {
class Map {
public:
- int16 _mapWidth;
- int16 _mapHeight;
-
- int16 _screenWidth;
- int16 _screenHeight;
- int16 _tilesWidth;
- int16 _tilesHeight;
-
- bool _bigTiles;
-
- bool _mapUnknownBool;
-
int16 _nearestWayPoint;
int16 _nearestDest;
- int16 **_itemsMap; // [y][x]
-
int16 _curGoblinX;
int16 _curGoblinY;
int16 _destX;
@@ -102,6 +88,17 @@ public:
uint8 getVersion() const;
+ int16 getMapWidth() const;
+ int16 getMapHeight() const;
+
+ int16 getScreenWidth() const;
+ int16 getScreenHeight() const;
+
+ int16 getTilesWidth() const;
+ int16 getTilesHeight() const;
+
+ bool hasBigTiles() const;
+
int8 getPass(int x, int y, int width = -1) const;
void setPass(int x, int y, int8 pass, int width = -1);
@@ -136,12 +133,27 @@ protected:
uint8 _mapVersion;
+ int16 _mapWidth;
+ int16 _mapHeight;
+
+ int16 _screenWidth;
+ int16 _screenHeight;
+
+ int16 _tilesWidth;
+ int16 _tilesHeight;
+
+ bool _bigTiles;
+
+ bool _mapUnknownBool;
+
int16 _passWidth;
int8 *_passMap; // [y * _mapWidth + x], getPass(x, y);
int16 _wayPointCount;
WayPoint *_wayPoints;
+ int16 **_itemsMap; // [y][x]
+
int16 findNearestWayPoint(int16 x, int16 y);
private: