Mercurial > fife-parpg

comparison 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
comparison
equal deleted inserted replaced
203:44919eb74c40 204:5816ab527da8
367 finalizeAction(); 367 finalizeAction();
368 } 368 }
369 } 369 }
370 } 370 }
371 371
372 m_activity->m_actioninfo->m_prev_call_time = m_activity->m_timeprovider->getGameTime(); 372 // previous code may invalidate actioninfo.
373 if( m_activity->m_actioninfo ) {
374 m_activity->m_actioninfo->m_prev_call_time = m_activity->m_timeprovider->getGameTime();
375 }
373 } 376 }
374 if (m_activity->m_sayinfo) { 377 if (m_activity->m_sayinfo) {
375 if (m_activity->m_sayinfo->m_duration > 0) { 378 if (m_activity->m_sayinfo->m_duration > 0) {
376 if (m_activity->m_timeprovider->getGameTime() >= m_activity->m_sayinfo->m_start_time + m_activity->m_sayinfo->m_duration) { 379 if (m_activity->m_timeprovider->getGameTime() >= m_activity->m_sayinfo->m_start_time + m_activity->m_sayinfo->m_duration) {
377 say(""); 380 say("");