aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBendegúz Nagy2016-06-19 00:48:28 +0200
committerBendegúz Nagy2016-08-26 23:02:22 +0200
commit749ffcc3f0e7866a8edc8d9591fe70d152fc157a (patch)
tree0b46d5ba1da1e90bc05fc101ac7aa74c2db65876
parent9d7f35cc8282f1ee6a41ea98d56388030435b4c4 (diff)
downloadscummvm-rg350-749ffcc3f0e7866a8edc8d9591fe70d152fc157a.tar.gz
scummvm-rg350-749ffcc3f0e7866a8edc8d9591fe70d152fc157a.tar.bz2
scummvm-rg350-749ffcc3f0e7866a8edc8d9591fe70d152fc157a.zip
DM: Add F0032_OBJECT_GetType
-rw-r--r--engines/dm/objectman.cpp13
-rw-r--r--engines/dm/objectman.h2
2 files changed, 15 insertions, 0 deletions
diff --git a/engines/dm/objectman.cpp b/engines/dm/objectman.cpp
index 4ab760d53a..e65b061225 100644
--- a/engines/dm/objectman.cpp
+++ b/engines/dm/objectman.cpp
@@ -1,8 +1,21 @@
#include "objectman.h"
+#include "dungeonman.h"
namespace DM {
ObjectMan::ObjectMan(DMEngine *vm): _vm(vm) {}
+IconIndice ObjectMan::getObjectType(Thing thing) {
+ if (thing == Thing::_thingNone)
+ return kIconIndiceNone;
+
+ int16 objectInfoIndex = _vm->_dungeonMan->getObjectInfoIndex(thing);
+ if (objectInfoIndex != -1) {
+ objectInfoIndex = gObjectInfo[objectInfoIndex]._type;
+ }
+ return (IconIndice)objectInfoIndex;
+}
+
+
} \ No newline at end of file
diff --git a/engines/dm/objectman.h b/engines/dm/objectman.h
index 347703c86f..6421d7c04f 100644
--- a/engines/dm/objectman.h
+++ b/engines/dm/objectman.h
@@ -1,4 +1,5 @@
#include "dm.h"
+#include "champion.h"
namespace DM {
@@ -7,6 +8,7 @@ class ObjectMan {
DMEngine *_vm;
public:
ObjectMan(DMEngine *vm);
+ IconIndice getObjectType(Thing thing); // @ F0032_OBJECT_GetType
};