KOTORBASE: Extract method to add creature to the area

xoreos · Feb 25, 2019 · 811dac0 · 811dac0
1 parent fb6bdea
commit 811dac0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/engines/kotorbase/area.cpp b/src/engines/kotorbase/area.cpp
@@ -465,9 +465,7 @@ void Area::loadDoors(const Aurora::GFF3List &list) {
 void Area::loadCreatures(const Aurora::GFF3List &list) {
 	for (Aurora::GFF3List::const_iterator c = list.begin(); c != list.end(); ++c) {
 		Creature *creature = _module->createCreature(**c);
-
-		loadObject(*creature);
-		_creatures.push_back(creature);
+		addCreature(creature);
 	}
 }
 
@@ -747,6 +745,11 @@ void Area::processCreaturesActions(float dt) {
 	}
 }
 
+void Area::addCreature(Creature *creature) {
+	loadObject(*creature);
+	_creatures.push_back(creature);
+}
+
 void Area::removeObject(Object *object) {
 	if (object == _activeObject) {
 		_activeObject->leave();

diff --git a/src/engines/kotorbase/area.h b/src/engines/kotorbase/area.h
@@ -133,6 +133,13 @@ class Area : public Object, public Events::Notifyable {
 	void toggleTriggers();
 	void evaluateTriggers(float x, float y);
 
+	// Object management
+
+	Object *getObjectByTag(const Common::UString &tag);
+
+	void addCreature(Creature *creature);
+	void removeObject(Object *object);
+
 
 	void showAllRooms();
 
@@ -142,12 +149,9 @@ class Area : public Object, public Events::Notifyable {
 	void getCameraStyle(float &distance, float &pitch, float &height) const;
 	const std::vector<Common::UString> &getRoomsVisibleFrom(const Common::UString &room) const;
 	Object *getActiveObject();
-	Object *getObjectByTag(const Common::UString &tag);
 
 	void processCreaturesActions(float dt);
 
-	void removeObject(Object *object);
-
 protected:
 	void notifyCameraMoved();