Mercurial > fife-parpg
comparison engine/core/model/structures/instance.cpp @ 244:7887f3854862
'Fixed' segfault in rio de hola. Font system in FIFE is odd.
Also don't call onActionFinished in ~Instance.
author | phoku@33b003aa-7bff-0310-803a-e67f0ece8222 |
---|---|
date | Wed, 25 Mar 2009 09:38:10 +0000 |
parents | 852da06fc922 |
children | d266506ff4f9 |
comparison
equal
deleted
inserted
replaced
243:a822b1a6e3cd | 244:7887f3854862 |
---|---|
176 ++itor) { | 176 ++itor) { |
177 (*itor)->onInstanceDeleted(this); | 177 (*itor)->onInstanceDeleted(this); |
178 } | 178 } |
179 | 179 |
180 if(m_activity && m_activity->m_actioninfo) { | 180 if(m_activity && m_activity->m_actioninfo) { |
181 // Don't ditribute onActionFinished in case we're already | |
182 // deleting. | |
183 m_activity->m_actionlisteners.clear(); | |
181 finalizeAction(); | 184 finalizeAction(); |
182 } | 185 } |
183 | 186 |
184 delete m_activity; | 187 delete m_activity; |
185 delete m_facinglocation; | 188 delete m_facinglocation; |