[Scummvm-cvs-logs] SF.net SVN: scummvm: [21263] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Mon Mar 13 09:20:02 CET 2006
Revision: 21263
Author: lordhoto
Date: 2006-03-13 09:19:19 -0800 (Mon, 13 Mar 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21263&view=rev
Log Message:
-----------
- Fixed regression when moving waitTicks to delay (removes wrongly drawn shapes and wrongly call of the kyragame fading in the outro)
- Removes a new line from a warning in seqplayer.cpp
Modified Paths:
--------------
scummvm/trunk/engines/kyra/kyra.cpp
scummvm/trunk/engines/kyra/seqplayer.cpp
Modified: scummvm/trunk/engines/kyra/kyra.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra.cpp 2006-03-13 15:15:09 UTC (rev 21262)
+++ scummvm/trunk/engines/kyra/kyra.cpp 2006-03-13 17:19:19 UTC (rev 21263)
@@ -785,11 +785,12 @@
if (_debugger->isAttached())
_debugger->onFrame();
- if (update)
+ if (update) {
_sprites->updateSceneAnims();
_animator->updateAllObjectShapes();
+ }
- if (_currentCharacter && _currentCharacter->sceneId == 210) {
+ if (_currentCharacter && _currentCharacter->sceneId == 210 && update) {
updateKyragemFading();
}
Modified: scummvm/trunk/engines/kyra/seqplayer.cpp
===================================================================
--- scummvm/trunk/engines/kyra/seqplayer.cpp 2006-03-13 15:15:09 UTC (rev 21262)
+++ scummvm/trunk/engines/kyra/seqplayer.cpp 2006-03-13 17:19:19 UTC (rev 21263)
@@ -225,7 +225,7 @@
void SeqPlayer::s1_skip() {
uint8 a = *_seqData++;
- warning("STUB: s1_skip(%d)\n", a);
+ warning("STUB: s1_skip(%d)", a);
}
void SeqPlayer::s1_loadPalette() {
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