NWN: Set the correct model state for doors and placeables

xoreos · Jan 29, 2014 · 7ed0242 · 7ed0242
1 parent 425f146
commit 7ed0242
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 0 deletions.
diff --git a/src/engines/nwn/door.cpp b/src/engines/nwn/door.cpp
@@ -57,6 +57,13 @@ Door::Door(Module &module, const Aurora::GFFStruct &door) : Situated(kObjectType
 Door::~Door() {
 }
 
+void Door::setVisible(bool visible) {
+	if (visible)
+		setModelState();
+
+	Situated::setVisible(visible);
+}
+
 void Door::load(const Aurora::GFFStruct &door) {
 	Common::UString temp = door.getString("TemplateResRef");
 
@@ -188,6 +195,29 @@ void Door::evaluateLink() {
 	_evaluatedLink = true;
 }
 
+void Door::setModelState() {
+	if (!_model)
+		return;
+
+	switch (_state) {
+		case kStateClosed:
+			_model->setState("closed");
+			break;
+
+		case kStateOpened1:
+			_model->setState("opened1");
+			break;
+
+		case kStateOpened2:
+			_model->setState("opened2");
+			break;
+
+		default:
+			_model->setState("");
+			break;
+	}
+}
+
 } // End of namespace NWN
 
 } // End of namespace Engines
diff --git a/src/engines/nwn/door.h b/src/engines/nwn/door.h
@@ -55,6 +55,9 @@ class Door : public Situated {
 	Door(Module &module, const Aurora::GFFStruct &door);
 	~Door();
 
+	/** Show/Hide the door's model. */
+	void setVisible(bool visible);
+
 	/** Is the door open? */
 	bool isOpen() const;
 
@@ -103,6 +106,9 @@ class Door : public Situated {
 
 	/** Evaluate our link. */
 	void evaluateLink();
+
+	/** Sync the model state with the door state. */
+	void setModelState();
 };
 
 } // End of namespace NWN

diff --git a/src/engines/nwn/placeable.cpp b/src/engines/nwn/placeable.cpp
@@ -52,6 +52,13 @@ Placeable::Placeable(const Aurora::GFFStruct &placeable) : Situated(kObjectTypeP
 Placeable::~Placeable() {
 }
 
+void Placeable::setVisible(bool visible) {
+	if (visible)
+		setModelState();
+
+	Situated::setVisible(visible);
+}
+
 void Placeable::load(const Aurora::GFFStruct &placeable) {
 	Common::UString temp = placeable.getString("TemplateResRef");
 
@@ -86,6 +93,41 @@ bool Placeable::isOpen() const {
 	return _state == kStateOpen;
 }
 
+void Placeable::setModelState() {
+	if (!_model)
+		return;
+
+	switch (_state) {
+		case kStateDefault:
+			_model->setState("default");
+			break;
+
+		case kStateOpen:
+			_model->setState("open");
+			break;
+
+		case kStateClosed:
+			_model->setState("close");
+			break;
+
+		case kStateDestroyed:
+			_model->setState("dead");
+			break;
+
+		case kStateActivated:
+			_model->setState("on");
+			break;
+
+		case kStateDeactivated:
+			_model->setState("off");
+			break;
+
+		default:
+			_model->setState("");
+			break;
+	}
+}
+
 } // End of namespace NWN
 
 } // End of namespace Engines
diff --git a/src/engines/nwn/placeable.h b/src/engines/nwn/placeable.h
@@ -54,6 +54,9 @@ class Placeable : public Situated {
 	Placeable(const Aurora::GFFStruct &placeable);
 	~Placeable();
 
+	/** Show/Hide the placeable's model. */
+	void setVisible(bool visible);
+
 	/** Is the placeable open? */
 	bool isOpen() const;
 
@@ -68,6 +71,9 @@ class Placeable : public Situated {
 
 	/** Load from a placeable instance. */
 	void load(const Aurora::GFFStruct &placeable);
+
+	/** Sync the model state with the placeable state. */
+	void setModelState();
 };
 
 } // End of namespace NWN