From 165681b142b5b315616d6bf9a45160cbcf034ee6 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Sun, 24 Mar 2013 23:44:39 +0100 Subject: HOPKINS: Move more variables and functions out of Globals --- engines/hopkins/objects.h | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'engines/hopkins/objects.h') diff --git a/engines/hopkins/objects.h b/engines/hopkins/objects.h index f43b09f78b..ed8b202c32 100644 --- a/engines/hopkins/objects.h +++ b/engines/hopkins/objects.h @@ -108,6 +108,9 @@ private: int _homeRateCounter; int _sortedDisplayCount; SortItem _sortedDisplay[51]; + byte *_hidingItemData[6]; + HidingItem _hidingItem[25]; + bool _hidingActiveFl; void sprite_alone(const byte *objectData, byte *sprite, int objIndex); void removeObjectDataBuf(); @@ -236,8 +239,18 @@ public: void doActionDiagRight(int idx); void doActionDiagLeft(int idx); byte *loadObjectFromFile(int objIndex, bool mode); + void resetHidingItems(); + void resetHidingUseCount(int idx); + void setHidingUseCount(int idx); + void loadHidingItems(const Common::String &file); + void enableHiding(); + void disableHiding(); void resetHomeRateCounter() { _homeRateCounter = 0; } + void resetOldFrameIndex() { _oldFrameIndex = -1; } + void resetOldDirection() { _oldDirection = DIR_NONE; } + int getObjectWidth() { return _objectWidth; } + int getObjectHeight() { return _objectHeight; } void PERSONAGE(const Common::String &backgroundFile, const Common::String &linkFile, const Common::String &animFile, const Common::String &s4, int soundNum, bool initializeScreen); @@ -254,11 +267,6 @@ public: void OPTI_BOBON(int idx1, int idx2, int idx3, int anim1Idx, int anim2Idx, int anim3Idx); void SPACTION1(byte *spriteData, const Common::String &animString, int speed); void PARADISE(); - - void resetOldFrameIndex() { _oldFrameIndex = -1; } - void resetOldDirection() { _oldDirection = DIR_NONE; } - int getObjectWidth() { return _objectWidth; } - int getObjectHeight() { return _objectHeight; } }; } // End of namespace Hopkins -- cgit v1.2.3