diff options
| author | Colin Snover | 2017-02-18 16:17:11 -0600 |
|---|---|---|
| committer | Colin Snover | 2017-04-23 13:07:25 -0500 |
| commit | eadf5d818f7dd124a8d70fde7ced8a9e5ce35c04 (patch) | |
| tree | d425482d157dbbcbcfe9f7cae6ec6d81dcbe1f56 /engines/sci/engine/script.h | |
| parent | 2906ca994716d77cca73928a0c053ac5f2aadd94 (diff) | |
| download | scummvm-rg350-eadf5d818f7dd124a8d70fde7ced8a9e5ce35c04.tar.gz scummvm-rg350-eadf5d818f7dd124a8d70fde7ced8a9e5ce35c04.tar.bz2 scummvm-rg350-eadf5d818f7dd124a8d70fde7ced8a9e5ce35c04.zip | |
SCI: Fix support for 32-bit SCI3 script offsets
Diffstat (limited to 'engines/sci/engine/script.h')
| -rw-r--r-- | engines/sci/engine/script.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sci/engine/script.h b/engines/sci/engine/script.h index 01f3e788b7..2be3fd0264 100644 --- a/engines/sci/engine/script.h +++ b/engines/sci/engine/script.h @@ -48,7 +48,7 @@ enum ScriptObjectTypes { SCI_OBJ_LOCALVARS }; -typedef Common::HashMap<uint16, Object> ObjMap; +typedef Common::HashMap<uint32, Object> ObjMap; enum ScriptOffsetEntryTypes { SCI_SCR_OFFSET_TYPE_OBJECT = 0, // classes are handled by this type as well @@ -114,7 +114,7 @@ public: void syncLocalsBlock(SegManager *segMan); ObjMap &getObjectMap() { return _objects; } const ObjMap &getObjectMap() const { return _objects; } - bool offsetIsObject(uint16 offset) const; + bool offsetIsObject(uint32 offset) const; public: Script(); @@ -123,7 +123,7 @@ public: void freeScript(); void load(int script_nr, ResourceManager *resMan, ScriptPatcher *scriptPatcher); - virtual bool isValidOffset(uint16 offset) const; + virtual bool isValidOffset(uint32 offset) const; virtual SegmentRef dereference(reg_t pointer); virtual reg_t findCanonicAddress(SegManager *segMan, reg_t sub_addr) const; virtual void freeAtAddress(SegManager *segMan, reg_t sub_addr); @@ -140,8 +140,8 @@ public: virtual void saveLoadWithSerializer(Common::Serializer &ser); - Object *getObject(uint16 offset); - const Object *getObject(uint16 offset) const; + Object *getObject(uint32 offset); + const Object *getObject(uint32 offset) const; /** * Initializes an object within the segment manager |