Mercurial > fife-parpg

diff engine/core/model/structures/instance.cpp @ 204:5816ab527da8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix for broken unit test.
author phoku@33b003aa-7bff-0310-803a-e67f0ece8222
date Sat, 14 Mar 2009 12:03:56 +0000
parents 3d0cc4545938
children 044d1fead5d2
line wrap: on
line diff
--- a/engine/core/model/structures/instance.cpp	Sat Mar 14 02:42:49 2009 +0000
+++ b/engine/core/model/structures/instance.cpp	Sat Mar 14 12:03:56 2009 +0000
@@ -369,7 +369,10 @@
 				}
 			}
 
-			m_activity->m_actioninfo->m_prev_call_time = m_activity->m_timeprovider->getGameTime();
+			// previous code may invalidate actioninfo.
+			if( m_activity->m_actioninfo ) {
+				m_activity->m_actioninfo->m_prev_call_time = m_activity->m_timeprovider->getGameTime();
+			}
 		}
 		if (m_activity->m_sayinfo) {
 			if (m_activity->m_sayinfo->m_duration > 0) {