Mercurial > fife-parpg

diff engine/core/model/structures/instance.cpp @ 684:4f36c890b1dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Merged the 0.3.3dev branche changes to the trunk.
author helios2000@33b003aa-7bff-0310-803a-e67f0ece8222
date Mon, 06 Dec 2010 19:25:27 +0000
parents a46368b3d8a0
children
line wrap: on
line diff
--- a/engine/core/model/structures/instance.cpp	Mon Dec 06 18:37:18 2010 +0000
+++ b/engine/core/model/structures/instance.cpp	Mon Dec 06 19:25:27 2010 +0000
@@ -182,7 +182,9 @@
 		m_object(object),
 		m_location(location),
 		m_facinglocation(NULL),
-		m_visual(NULL) {
+		m_visual(NULL),
+		m_blocking(object->isBlocking()),
+		m_override_blocking(false) {
 	}
 
 	Instance::~Instance() {
@@ -244,6 +246,16 @@
 		m_id = identifier;
 	}
 
+	void Instance::setBlocking(bool blocking) {
+		if (m_override_blocking) {
+			m_blocking = blocking;
+		}
+	}
+
+	bool Instance::isBlocking() const {
+		return m_blocking;
+	}
+
 	void Instance::addActionListener(InstanceActionListener* listener) {
 		initializeChanges();
 		m_activity->m_actionlisteners.push_back(listener);