aboutsummaryrefslogtreecommitdiff
path: root/scumm/scumm.h
diff options
context:
space:
mode:
authorMax Horn2005-04-17 23:19:16 +0000
committerMax Horn2005-04-17 23:19:16 +0000
commit96e40213efc65644c3685ca543f6ddbc05a27d87 (patch)
tree4d648d30e1e100841127adbe7fd6c1bfcb2a904e /scumm/scumm.h
parentc4e7f403f8b36c4c0437b6fa911f383dfa0770ab (diff)
downloadscummvm-rg350-96e40213efc65644c3685ca543f6ddbc05a27d87.tar.gz
scummvm-rg350-96e40213efc65644c3685ca543f6ddbc05a27d87.tar.bz2
scummvm-rg350-96e40213efc65644c3685ca543f6ddbc05a27d87.zip
New virtual method getObjectIdFromOBIM
svn-id: r17660
Diffstat (limited to 'scumm/scumm.h')
-rw-r--r--scumm/scumm.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h
index 35da5caa02..4935af2ada 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -744,7 +744,6 @@ public:
protected:
byte *_objectOwnerTable, *_objectRoomTable, *_objectStateTable;
- ObjectIDMap _objectIDMap;
int _numObjectsInRoom;
virtual void setupRoomObject(ObjectData *od, const byte *room, const byte *searchptr = NULL);
@@ -794,6 +793,7 @@ protected:
byte *getOBCDFromObject(int obj);
const byte *getOBIMFromObject(const ObjectData &od);
const byte *getObjectImage(const byte *ptr, int state);
+ virtual int getObjectIdFromOBIM(const byte *obim);
int getDistanceBetween(bool is_obj_1, int b, int c, bool is_obj_2, int e, int f);