diff options
| author | Strangerke | 2011-09-17 17:17:22 +0200 |
|---|---|---|
| committer | Strangerke | 2011-09-17 17:17:22 +0200 |
| commit | 3583c949f253330dbf4c53a66b74e764de9ea156 (patch) | |
| tree | 13d3aa82e12feef7300f8cf615af210d6efd8448 /engines/cge/walk.h | |
| parent | 8491e557ce46f03ca98f9a4486005a5e337de8ed (diff) | |
| download | scummvm-rg350-3583c949f253330dbf4c53a66b74e764de9ea156.tar.gz scummvm-rg350-3583c949f253330dbf4c53a66b74e764de9ea156.tar.bz2 scummvm-rg350-3583c949f253330dbf4c53a66b74e764de9ea156.zip | |
CGE: Move some more globals to CGEEngine
Diffstat (limited to 'engines/cge/walk.h')
| -rw-r--r-- | engines/cge/walk.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/engines/cge/walk.h b/engines/cge/walk.h index 2224ae8745..99dc362eec 100644 --- a/engines/cge/walk.h +++ b/engines/cge/walk.h @@ -34,8 +34,6 @@ namespace CGE { -#define kMapXCnt 40 -#define kMapZCnt 20 #define kMapArrSize (kMapZCnt * kMapXCnt) #define kMapTop 80 #define kMapHig 80 @@ -47,15 +45,12 @@ enum Dir { kDirNone = -1, kDirNorth, kDirEast, kDirSouth, kDirWest }; class Cluster { public: - static uint8 _map[kMapZCnt][kMapXCnt]; - static CGEEngine *_vm; + CGEEngine *_vm; Common::Point _pt; - - static void init(CGEEngine *vm); public: uint8 &cell(); - Cluster(int16 a, int16 b) { _pt = Common::Point(a, b); } - Cluster() { _pt = Common::Point(-1, -1); } + Cluster(CGEEngine *vm, int16 a, int16 b); + Cluster(CGEEngine *vm); bool chkBar() const; bool isValid() const; }; @@ -69,10 +64,11 @@ public: int _level; int _findLevel; Common::Point _target; - Cluster _trace[kMaxFindLevel]; + Common::Array<Cluster *> _trace; Dir _dir; Walk(CGEEngine *vm, BitmapPtr *shpl); + ~Walk(); void tick(); void findWay(Cluster c); void findWay(Sprite *spr); @@ -86,8 +82,6 @@ public: bool find1Way(Cluster c); }; -extern Walk *_hero; - } // End of namespace CGE #endif |