aboutsummaryrefslogtreecommitdiff
path: root/engines/dm/objectman.h
diff options
context:
space:
mode:
authorBendegúz Nagy2016-08-26 22:38:06 +0200
committerBendegúz Nagy2016-08-26 23:02:22 +0200
commitfab051093691fdcf3f29662e95699bc080f5602a (patch)
tree9ce5ef6a53e1485ed25c5976d3947bdef402b506 /engines/dm/objectman.h
parent4044dfa3647f0ba40493d8f07863b2d1f5f76f09 (diff)
downloadscummvm-rg350-fab051093691fdcf3f29662e95699bc080f5602a.tar.gz
scummvm-rg350-fab051093691fdcf3f29662e95699bc080f5602a.tar.bz2
scummvm-rg350-fab051093691fdcf3f29662e95699bc080f5602a.zip
DM: Move gSlotBoxes to ObjectMan
Diffstat (limited to 'engines/dm/objectman.h')
-rw-r--r--engines/dm/objectman.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/dm/objectman.h b/engines/dm/objectman.h
index fbf880db7e..a2ceafefbe 100644
--- a/engines/dm/objectman.h
+++ b/engines/dm/objectman.h
@@ -41,15 +41,17 @@ public:
int16 _y;
int16 _iconIndex;
SlotBox(int16 x, int16 y, int16 iconIndex): _x(x), _y(y), _iconIndex(iconIndex) {}
+ SlotBox(): _x(-1), _y(-1), _iconIndex(-1) {}
}; // @ SLOT_BOX
-extern SlotBox gSlotBoxes[46]; // @ G0030_as_Graphic562_SlotBoxes
-
class ObjectMan {
DMEngine *_vm;
+
public:
explicit ObjectMan(DMEngine *vm);
+ SlotBox _slotBoxes[46]; // @ G0030_as_Graphic562_SlotBoxes;
+
IconIndice getObjectType(Thing thing); // @ F0032_OBJECT_GetType
IconIndice getIconIndex(Thing thing); // @ F0033_OBJECT_GetIconIndex
void extractIconFromBitmap(uint16 iconIndex, byte *srcBitmap); // F0036_OBJECT_ExtractIconFromBitmap