WITCHER: Register objects with ObjectManager

xoreos · Aug 28, 2018 · 3e3d365 · 3e3d365
1 parent b403b81
commit 3e3d365
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/engines/witcher/object.cpp b/src/engines/witcher/object.cpp
@@ -24,9 +24,12 @@
 
 #include "src/common/util.h"
 #include "src/common/error.h"
+#include "src/common/uuid.h"
 
 #include "src/aurora/dlgfile.h"
 
+#include "src/aurora/nwscript/objectman.h"
+
 #include "src/sound/sound.h"
 
 #include "src/engines/aurora/util.h"
@@ -39,6 +42,8 @@ namespace Witcher {
 
 Object::Object(ObjectType type) : _type(type),
 	_static(false), _usable(true), _area(0) {
+	_id = Common::generateIDNumber();
+	ObjectMan.registerObject(this);
 
 	_position   [0] = 0.0f;
 	_position   [1] = 0.0f;
@@ -50,6 +55,7 @@ Object::Object(ObjectType type) : _type(type),
 }
 
 Object::~Object() {
+	ObjectMan.unregisterObject(this);
 }
 
 ObjectType Object::getType() const {