diff options
author | Andrew Kurushin | 2010-10-22 23:13:17 +0000 |
---|---|---|
committer | Andrew Kurushin | 2010-10-22 23:13:17 +0000 |
commit | f24394b85f5d34815659c50cd956c262f4b79d68 (patch) | |
tree | 8c93e3f052133b154b1686e00b4066b3967f0c02 /engines/saga/isomap.h | |
parent | b8ff3eb4913dd22bc75ae360baadadd95151077f (diff) | |
download | scummvm-rg350-f24394b85f5d34815659c50cd956c262f4b79d68.tar.gz scummvm-rg350-f24394b85f5d34815659c50cd956c262f4b79d68.tar.bz2 scummvm-rg350-f24394b85f5d34815659c50cd956c262f4b79d68.zip |
SAGA: replace Actor::_pathCell, Anim::*, Converse::text, IsoMap::*, Music::_songTable, ObjectMap::*, PalAnim::*, Scene::sceneLut, SndRes::_fxTable* malloc based arrays with Common::Array implementation
add ByteArray type
fix debug Tile Hittest frame drawing
debug 0x%x => 0x%X
svn-id: r53719
Diffstat (limited to 'engines/saga/isomap.h')
-rw-r--r-- | engines/saga/isomap.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/engines/saga/isomap.h b/engines/saga/isomap.h index 46173e2b13..e2502d4a77 100644 --- a/engines/saga/isomap.h +++ b/engines/saga/isomap.h @@ -95,7 +95,7 @@ enum TileMapEdgeType { struct IsoTileData { byte height; int8 attributes; - size_t offset; + byte *tilePointer; uint16 terrainMask; byte FGDBGDAttr; int8 GetMaskRule() const { @@ -154,14 +154,13 @@ class IsoMap { public: IsoMap(SagaEngine *vm); ~IsoMap() { - freeMem(); } void loadImages(const byte * resourcePointer, size_t resourceLength); void loadMap(const byte * resourcePointer, size_t resourceLength); void loadPlatforms(const byte * resourcePointer, size_t resourceLength); void loadMetaTiles(const byte * resourcePointer, size_t resourceLength); void loadMulti(const byte * resourcePointer, size_t resourceLength); - void freeMem(); + void clear(); void draw(); void drawSprite(SpriteList &spriteList, int spriteNumber, const Location &location, const Point &screenPosition, int scale); void adjustScroll(bool jump); @@ -213,16 +212,14 @@ private: IsoTileData *getTile(int16 u, int16 v, int16 z); - byte *_tileData; - size_t _tileDataLength; + ByteArray _tileData; Common::Array<IsoTileData> _tilesTable; Common::Array<TilePlatformData> _tilePlatformList; Common::Array<MetaTileData> _metaTileList; Common::Array<MultiTileEntryData> _multiTable; - uint16 _multiDataCount; - int16 *_multiTableData; + Common::Array<int16> _multiTableData; TileMapData _tileMap; |