ObjDefManager: Set replacement object's handle info after calling set()

kwolekr · kwolekr · commit 5b237b4d94cc · 2015-05-03T22:19:35.000-04:00
Make gamedef optional when constructing an ObjDefManager
Add note about object ownership
diff --git a/src/mapgen.cpp b/src/mapgen.cpp
@@ -434,7 +434,7 @@ void GenerateNotifier::getEvents(
 ObjDefManager::ObjDefManager(IGameDef *gamedef, ObjDefType type)
 {
 	m_objtype = type;
-	m_ndef = gamedef->getNodeDefManager();
+	m_ndef = gamedef ? gamedef->getNodeDefManager() : NULL;
 }
 
 
@@ -471,7 +471,16 @@ ObjDef *ObjDefManager::get(ObjDefHandle handle) const
 ObjDef *ObjDefManager::set(ObjDefHandle handle, ObjDef *obj)
 {
 	u32 index = validateHandle(handle);
-	return (index != OBJDEF_INVALID_INDEX) ? setRaw(index, obj) : NULL;
+	if (index == OBJDEF_INVALID_INDEX)
+		return NULL;
+
+	ObjDef *oldobj = setRaw(index, obj);
+
+	obj->uid    = oldobj->uid;
+	obj->index  = oldobj->index;
+	obj->handle = oldobj->handle;
+
+	return oldobj;
 }
 
 
diff --git a/src/mapgen.h b/src/mapgen.h
@@ -206,12 +206,15 @@ class ObjDef {
 	std::string name;
 };
 
+// WARNING: Ownership of ObjDefs is transferred to the ObjDefManager it is
+// added/set to.  Note that ObjDefs managed by ObjDefManager are NOT refcounted,
+// so the same ObjDef instance must not be referenced multiple
 class ObjDefManager {
 public:
 	ObjDefManager(IGameDef *gamedef, ObjDefType type);
 	virtual ~ObjDefManager();
 
-	virtual const char *getObjectTitle() const = 0;
+	virtual const char *getObjectTitle() const { return "ObjDef"; }
 
 	virtual void clear();
 	virtual ObjDef *getByName(const std::string &name) const;

Original file line number	Diff line number	Diff line change
`@@ -434,7 +434,7 @@ void GenerateNotifier::getEvents(`
`434`	`434`	`ObjDefManager::ObjDefManager(IGameDef *gamedef, ObjDefType type)`
`435`	`435`	`{`
`436`	`436`	`m_objtype = type;`
`437`		`- m_ndef = gamedef->getNodeDefManager();`
	`437`	`+ m_ndef = gamedef ? gamedef->getNodeDefManager() : NULL;`
`438`	`438`	`}`
`439`	`439`
`440`	`440`
`@@ -471,7 +471,16 @@ ObjDef *ObjDefManager::get(ObjDefHandle handle) const`
`471`	`471`	`ObjDef ObjDefManager::set(ObjDefHandle handle, ObjDef obj)`
`472`	`472`	`{`
`473`	`473`	`u32 index = validateHandle(handle);`
`474`		`- return (index != OBJDEF_INVALID_INDEX) ? setRaw(index, obj) : NULL;`
	`474`	`+ if (index == OBJDEF_INVALID_INDEX)`
	`475`	`+ return NULL;`
	`476`	`+`
	`477`	`+ ObjDef *oldobj = setRaw(index, obj);`
	`478`	`+`
	`479`	`+ obj->uid = oldobj->uid;`
	`480`	`+ obj->index = oldobj->index;`
	`481`	`+ obj->handle = oldobj->handle;`
	`482`	`+`
	`483`	`+ return oldobj;`
`475`	`484`	`}`
`476`	`485`
`477`	`486`