DRAGONAGE: Register objects with ObjectManager

xoreos · Aug 28, 2018 · e808e47 · e808e47
1 parent 23292fd
commit e808e47
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/engines/dragonage/area.cpp b/src/engines/dragonage/area.cpp
@@ -68,7 +68,7 @@ using namespace ::Aurora::GFF4FieldNamesEnum;
 
 Area::Area(Campaign &campaign, const Common::UString &resRef,
            const Common::UString &env, const Common::UString &rim) :
-	Object(kObjectTypeArea), _campaign(&campaign), _resRef(resRef), _activeObject(0), _highlightAll(0) {
+	Object(kObjectTypeArea), _campaign(&campaign), _resRef(resRef), _environmentID(0xFFFFFFFF), _activeObject(0), _highlightAll(0) {
 
 	try {
 
@@ -119,7 +119,7 @@ void Area::loadEnvironment(const Common::UString &resRef) {
 
 	const GFF4Struct &arlTop = arl.getTopLevel();
 
-	_id = (uint32) ((int32) arlTop.getSint(kGFF4EnvAreaID, -1));
+	_environmentID = (uint32) ((int32) arlTop.getSint(kGFF4EnvAreaID, -1));
 
 	_environmentName = arlTop.getString(kGFF4EnvAreaName);
 	_skyDome         = arlTop.getString(kGFF4EnvAreaSkydomeModel);

diff --git a/src/engines/dragonage/area.h b/src/engines/dragonage/area.h
@@ -103,6 +103,7 @@ class Area : public DragonAge::Object, public Events::Notifyable {
 
 	Common::UString _resRef;
 
+	uint32 _environmentID;
 	Common::UString _environmentName;
 	Common::UString _skyDome;
 

diff --git a/src/engines/dragonage/object.cpp b/src/engines/dragonage/object.cpp
@@ -24,10 +24,13 @@
 
 #include "src/common/util.h"
 #include "src/common/error.h"
+#include "src/common/uuid.h"
 
 #include "src/aurora/gff3file.h"
 #include "src/aurora/gff4file.h"
 
+#include "src/aurora/nwscript/objectman.h"
+
 #include "src/engines/dragonage/object.h"
 
 namespace Engines {
@@ -47,6 +50,9 @@ using ::Aurora::GFF4List;
 using namespace ::Aurora::GFF4FieldNamesEnum;
 
 Object::Object(ObjectType type) : _type(type), _static(true), _usable(false) {
+	_id = Common::generateIDNumber();
+	ObjectMan.registerObject(this);
+
 	_position[0] = 0.0f;
 	_position[1] = 0.0f;
 	_position[2] = 0.0f;
@@ -58,6 +64,7 @@ Object::Object(ObjectType type) : _type(type), _static(true), _usable(false) {
 }
 
 Object::~Object() {
+	ObjectMan.unregisterObject(this);
 }
 
 ObjectType Object::getType() const {