From 55587c0751ee9166aedf61154ad62f2e35caea2d Mon Sep 17 00:00:00 2001 From: Nipun Garg Date: Fri, 21 Jun 2019 04:50:26 +0530 Subject: HDB: Fix type of certain gfx arrays --- engines/hdb/ai.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'engines/hdb') diff --git a/engines/hdb/ai.h b/engines/hdb/ai.h index e3d846f1cc..cef6eaf0df 100644 --- a/engines/hdb/ai.h +++ b/engines/hdb/ai.h @@ -639,14 +639,6 @@ public: bool addToInventory(AIEntity *e); void clearInventory(); - // Cinematic Variables - Common::Array _cine; - -private: - - Common::Array *_ents; - AIEntity *_player; - // Player Variables bool _playerDead; bool _playerInvisible; // While on RailRider for example @@ -685,13 +677,13 @@ private: Tile *_plummetGfx[kMaxDeathFrames]; uint16 _clubUpFrames; - Tile *_clubUpGfx[kMaxAnimFrames]; + Picture *_clubUpGfx[kMaxAnimFrames]; uint16 _clubDownFrames; - Tile *_clubDownGfx[kMaxAnimFrames]; + Picture *_clubDownGfx[kMaxAnimFrames]; uint16 _clubLeftFrames; - Tile *_clubLeftGfx[kMaxAnimFrames]; + Picture *_clubLeftGfx[kMaxAnimFrames]; uint16 _clubRightFrames; - Tile *_clubRightGfx[kMaxAnimFrames]; + Picture *_clubRightGfx[kMaxAnimFrames]; uint16 _stunUpFrames; Tile *_stunUpGfx[kMaxAnimFrames]; @@ -701,7 +693,7 @@ private: Tile *_stunLeftGfx[kMaxAnimFrames]; uint16 _stunRightFrames; Tile *_stunRightGfx[kMaxAnimFrames]; - Tile *_stun_lightningGfx[kMaxAnimFrames]; + Tile *_stunLightningGfx[kMaxAnimFrames]; Tile *_stunnedGfx[kMaxAnimFrames]; uint16 _slugUpFrames; @@ -714,7 +706,7 @@ private: Tile *_slugRightGfx[kMaxAnimFrames]; uint16 _slugAttackFrames; - Tile *_slugAttackGfx[kMaxAnimFrames]; + Picture *_slugAttackGfx[kMaxAnimFrames]; // Player Resources and Deliveries @@ -729,6 +721,14 @@ private: int _numWaypoints; Tile *_waypointGfx[4]; // Animating waypoint gfx + // Cinematic Variables + Common::Array _cine; + +private: + + Common::Array *_ents; + AIEntity *_player; + // Cinematics Variables bool _cineAbortable; bool _cineAborted; -- cgit v1.2.3