[Scummvm-cvs-logs] SF.net SVN: scummvm:[53155] scummvm/trunk/engines/toon/toon.cpp
sylvaintv at users.sourceforge.net
sylvaintv at users.sourceforge.net
Tue Oct 12 01:12:59 CEST 2010
Revision: 53155
http://scummvm.svn.sourceforge.net/scummvm/?rev=53155&view=rev
Author: sylvaintv
Date: 2010-10-11 23:12:59 +0000 (Mon, 11 Oct 2010)
Log Message:
-----------
TOON: Reverted script throttle for now and fixed anim timing issue
Modified Paths:
--------------
scummvm/trunk/engines/toon/toon.cpp
Modified: scummvm/trunk/engines/toon/toon.cpp
===================================================================
--- scummvm/trunk/engines/toon/toon.cpp 2010-10-11 22:29:05 UTC (rev 53154)
+++ scummvm/trunk/engines/toon/toon.cpp 2010-10-11 23:12:59 UTC (rev 53155)
@@ -729,17 +729,20 @@
}
void ToonEngine::simpleUpdate() {
- updateCharacters(_tickLength);
- updateAnimationSceneScripts(_tickLength);
- updateTimer(getTickLength());
+ int32 elapsedTime = _system->getMillis() - _oldTimer2;
+ _oldTimer2 = _system->getMillis();
+ _oldTimer = _oldTimer2;
+
+ updateCharacters(elapsedTime);
+ updateAnimationSceneScripts(elapsedTime);
+ updateTimer(elapsedTime);
+ _animationManager->update(elapsedTime);
render();
if (!_audioManager->voiceStillPlaying()) {
_currentTextLine = 0;
_currentTextLineId = -1;
}
- _oldTimer2 = _system->getMillis();
- _oldTimer = _oldTimer2;
}
void ToonEngine::fixPaletteEntries(uint8 *palette, int num) {
@@ -775,7 +778,7 @@
if (!_script->run(&_sceneAnimationScripts[_lastProcessedSceneScript]._state))
_animationSceneScriptRunFlag = false;
- waitForScriptStep();
+ //waitForScriptStep();
if (_sceneAnimationScripts[_lastProcessedSceneScript]._frozen)
break;
@@ -3065,7 +3068,7 @@
0, 0
};
- return specialMusic[randRange(0, 1) + conversationId * 2];
+ return specialMusic[randRange(0, 1) + conversationId * 2];
}
void ToonEngine::viewInventoryItem(Common::String str, int32 lineId, int32 itemDest) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list