From fab051093691fdcf3f29662e95699bc080f5602a Mon Sep 17 00:00:00 2001
From: Bendegúz Nagy
Date: Fri, 26 Aug 2016 22:38:06 +0200
Subject: DM: Move gSlotBoxes to ObjectMan

---
 engines/dm/objectman.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'engines/dm/objectman.h')

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
-- 
cgit v1.2.3