diff options
author | Tobias Gunkel | 2012-01-07 16:08:55 +0100 |
---|---|---|
committer | Tobias Gunkel | 2012-02-11 08:28:14 +0100 |
commit | 1c32000a004cc184a8744e2467035a4c7ba2f3a5 (patch) | |
tree | 0be70cec22cace4d981817558ce15534f308c25c /engines/scumm/scumm.h | |
parent | c69a52853ccc42f3891ce4212fa281dbea65c3ea (diff) | |
download | scummvm-rg350-1c32000a004cc184a8744e2467035a4c7ba2f3a5.tar.gz scummvm-rg350-1c32000a004cc184a8744e2467035a4c7ba2f3a5.tar.bz2 scummvm-rg350-1c32000a004cc184a8744e2467035a4c7ba2f3a5.zip |
SCUMM: start handling object type and id correctly in mm c64
- removed complicated and unnecessary _v0ObjectIndex, _v0ObjectInInventory, _v0ObjectFlag vars
- started to merge object id and type into one object value (type<<8|id)
- verb preposition ids do not dependent on language -> remove from VerbSettings
Note:
- objects with type=0 are foreground objects. They have a state, an owner and a bg overlay image.
- objects with type=1 are bg objects. They do not have a state or owner and are already contained in the bg image. The do not have an entry in objectState/OwnerTable
Diffstat (limited to 'engines/scumm/scumm.h')
-rw-r--r-- | engines/scumm/scumm.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h index d9237b2b30..f004176da1 100644 --- a/engines/scumm/scumm.h +++ b/engines/scumm/scumm.h @@ -502,10 +502,6 @@ protected: int32 *_scummVars; byte *_bitVars; - bool _v0ObjectIndex; // V0 Use object index, instead of object number - bool _v0ObjectInInventory; // V0 Use object number from inventory - byte _v0ObjectFlag; - /* Global resource tables */ int _numVariables, _numBitVariables, _numLocalObjects; int _numGlobalObjects, _numArray, _numVerbs, _numFlObject; @@ -799,7 +795,6 @@ protected: int getObjNewDir(int obj); int getObjectIndex(int object) const; int getObjectImageCount(int object); - int whereIsObjectInventory(int object); int whereIsObject(int object) const; int findObject(int x, int y); void findObjectInRoom(FindObjectInRoom *fo, byte findWhat, uint object, uint room); @@ -820,7 +815,7 @@ protected: virtual void clearDrawQueues(); uint32 getOBCDOffs(int object) const; - byte *getOBCDFromObject(int obj); + byte *getOBCDFromObject(int obj, bool v0CheckInventory = true); const byte *getOBIMFromObjectData(const ObjectData &od); const byte *getObjectImage(const byte *ptr, int state); virtual int getObjectIdFromOBIM(const byte *obim); |