diff options
author | Max Horn | 2011-05-13 14:02:53 +0200 |
---|---|---|
committer | Max Horn | 2011-05-13 14:02:53 +0200 |
commit | 649f8e0a84804a9d1272ba16b146ea2b9da501fe (patch) | |
tree | 4e257a06140c69abb043d5c9a2eb3d23e5ff9e1b /engines/scumm/he/intern_he.h | |
parent | aaf2c0e6ebe373afd06cbf8ebca334710a4ed15d (diff) | |
download | scummvm-rg350-649f8e0a84804a9d1272ba16b146ea2b9da501fe.tar.gz scummvm-rg350-649f8e0a84804a9d1272ba16b146ea2b9da501fe.tar.bz2 scummvm-rg350-649f8e0a84804a9d1272ba16b146ea2b9da501fe.zip |
SCUMM: Rename ResTypes->ResType, introduce ResId typedef, change code to use both
Diffstat (limited to 'engines/scumm/he/intern_he.h')
-rw-r--r-- | engines/scumm/he/intern_he.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/engines/scumm/he/intern_he.h b/engines/scumm/he/intern_he.h index e1d7beec82..c49217b650 100644 --- a/engines/scumm/he/intern_he.h +++ b/engines/scumm/he/intern_he.h @@ -129,8 +129,8 @@ public: protected: virtual void allocateArrays(); - virtual int readResTypeList(int id); - virtual uint32 getResourceRoomOffset(int type, int idx); + virtual int readResTypeList(ResType type); + virtual uint32 getResourceRoomOffset(ResType type, ResId idx); virtual void setupOpcodes(); virtual void setupScummVars(); @@ -265,7 +265,7 @@ protected: virtual void resetScummVars(); virtual void readArrayFromIndexFile(); - virtual byte *getStringAddress(int i); + virtual byte *getStringAddress(ResId idx); virtual void readMAXS(int blockSize); virtual void redrawBGAreas(); @@ -289,7 +289,7 @@ protected: void copyScriptString(byte *dst, int dstSize); int findObject(int x, int y, int num, int *args); - int getSoundResourceSize(int id); + int getSoundResourceSize(ResId idx); virtual bool handleNextCharsetCode(Actor *a, int *c); virtual int convertMessageToString(const byte *msg, byte *dst, int dstSize); @@ -554,7 +554,8 @@ protected: class ScummEngine_v100he : public ScummEngine_v99he { protected: - int32 _heResId, _heResType; + ResType _heResType; + int32 _heResId; byte _debugInputBuffer[256]; public: |