Mercurial > fife-parpg

comparison 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
comparison
equal deleted inserted replaced
683:4fe9747d5f88 684:4f36c890b1dd
180 m_activity(NULL), 180 m_activity(NULL),
181 m_changeinfo(ICHANGE_NO_CHANGES), 181 m_changeinfo(ICHANGE_NO_CHANGES),
182 m_object(object), 182 m_object(object),
183 m_location(location), 183 m_location(location),
184 m_facinglocation(NULL), 184 m_facinglocation(NULL),
185 m_visual(NULL) { 185 m_visual(NULL),
186 m_blocking(object->isBlocking()),
187 m_override_blocking(false) {
186 } 188 }
187 189
188 Instance::~Instance() { 190 Instance::~Instance() {
189 std::vector<InstanceDeleteListener *>::iterator itor; 191 std::vector<InstanceDeleteListener *>::iterator itor;
190 for(itor = m_deletelisteners.begin(); 192 for(itor = m_deletelisteners.begin();
240 } 242 }
241 } 243 }
242 244
243 void Instance::setId(const std::string& identifier) { 245 void Instance::setId(const std::string& identifier) {
244 m_id = identifier; 246 m_id = identifier;
247 }
248
249 void Instance::setBlocking(bool blocking) {
250 if (m_override_blocking) {
251 m_blocking = blocking;
252 }
253 }
254
255 bool Instance::isBlocking() const {
256 return m_blocking;
245 } 257 }
246 258
247 void Instance::addActionListener(InstanceActionListener* listener) { 259 void Instance::addActionListener(InstanceActionListener* listener) {
248 initializeChanges(); 260 initializeChanges();
249 m_activity->m_actionlisteners.push_back(listener); 261 m_activity->m_actionlisteners.push_back(listener);