NWN: Start adding back creatures

No creatures of model type P (segmented models) yet.
xoreos · Jan 29, 2014 · 21debaa · 21debaa
1 parent 86d9545
commit 21debaa
Show file tree

Hide file tree

Showing 5 changed files with 957 additions and 0 deletions.
diff --git a/src/engines/nwn/Makefile.am b/src/engines/nwn/Makefile.am
@@ -16,6 +16,7 @@ noinst_HEADERS = \
                  situated.h \
                  door.h \
                  placeable.h \
+                 creature.h \
                  $(EMPTY)
 
 libnwn_la_SOURCES = \
@@ -33,4 +34,5 @@ libnwn_la_SOURCES = \
                     situated.cpp \
                     door.cpp \
                     placeable.cpp \
+                    creature.cpp \
                     $(EMPTY)
diff --git a/src/engines/nwn/area.cpp b/src/engines/nwn/area.cpp
@@ -50,6 +50,7 @@
 #include "engines/nwn/waypoint.h"
 #include "engines/nwn/door.h"
 #include "engines/nwn/placeable.h"
+#include "engines/nwn/creature.h"
 
 namespace Engines {
 
@@ -287,6 +288,10 @@ void Area::loadGIT(const Aurora::GFFStruct &git) {
 	// Doors
 	if (git.hasField("Door List"))
 		loadDoors(git.getList("Door List"));
+
+	// Creatures
+	if (git.hasField("Creature List"))
+		loadCreatures(git.getList("Creature List"));
 }
 
 void Area::loadProperties(const Aurora::GFFStruct &props) {
@@ -484,6 +489,14 @@ void Area::loadDoors(const Aurora::GFFList &list) {
 	}
 }
 
+void Area::loadCreatures(const Aurora::GFFList &list) {
+	for (Aurora::GFFList::const_iterator c = list.begin(); c != list.end(); ++c) {
+		Creature *creature = new Creature(**c);
+
+		loadObject(*creature);
+	}
+}
+
 Engines::NWN::Object *Area::getObjectAt(int x, int y, float &distance) const {
 	Graphics::Aurora::Renderable *r = SceneMan.getRenderableAt(x, y, Graphics::Aurora::kSelectableRenderable, distance);
 	if (!r)

diff --git a/src/engines/nwn/area.h b/src/engines/nwn/area.h
@@ -197,6 +197,7 @@ class Area : public Aurora::NWScript::Object {
 	void loadWaypoints (const Aurora::GFFList &list);
 	void loadPlaceables(const Aurora::GFFList &list);
 	void loadDoors     (const Aurora::GFFList &list);
+	void loadCreatures (const Aurora::GFFList &list);
 
 	// Model loading/unloading helpers