[Scummvm-cvs-logs] SF.net SVN: scummvm:[46366] scummvm/trunk/engines/kyra

[athrxx at users.sourceforge.net]

Revision: 46366
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46366&view=rev
Author:   athrxx
Date:     2009-12-13 20:37:26 +0000 (Sun, 13 Dec 2009)

Log Message:
-----------
LOL: fixed regression

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/animator_tim.cpp
    scummvm/trunk/engines/kyra/lol.cpp
    scummvm/trunk/engines/kyra/scene_lol.cpp
    scummvm/trunk/engines/kyra/sequences_lol.cpp

Modified: scummvm/trunk/engines/kyra/animator_tim.cpp
===================================================================
--- scummvm/trunk/engines/kyra/animator_tim.cpp	2009-12-13 20:31:07 UTC (rev 46365)
+++ scummvm/trunk/engines/kyra/animator_tim.cpp	2009-12-13 20:37:26 UTC (rev 46366)
@@ -65,7 +65,7 @@
 }
 
 void TimAnimator::init(int animIndex, Movie *wsa, int x, int y, int wsaCopyParams, int frameDelay) {
-	TimAnimator::Animation *anim = &_animations[animIndex];
+	Animation *anim = &_animations[animIndex];
 	anim->wsa = wsa;
 	anim->x = x;	
 	anim->y = y;
@@ -76,7 +76,7 @@
 }
 
 void TimAnimator::reset(int animIndex, bool clearStruct) {
-	TimAnimator::Animation *anim = &_animations[animIndex];
+	Animation *anim = &_animations[animIndex];
 	if (!anim)
 		return;
 	anim->field_D = 0;
@@ -98,7 +98,7 @@
 }
 
 void TimAnimator::displayFrame(int animIndex, int page, int frame, int flags) {
-	TimAnimator::Animation *anim = &_animations[animIndex];
+	Animation *anim = &_animations[animIndex];
 	if ((anim->wsaCopyParams & 0x4000) != 0)
 		page = 2;
 	// WORKAROUND for some bugged scripts that will try to display frames of non-existent animations

Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp	2009-12-13 20:31:07 UTC (rev 46365)
+++ scummvm/trunk/engines/kyra/lol.cpp	2009-12-13 20:37:26 UTC (rev 46366)
@@ -1794,7 +1794,7 @@
 }
 
 void LoLEngine::updateSequenceBackgroundAnimations() {
-	if (_updateFlags & 8)
+	if (_updateFlags & 8 || !_animator)
 		return;
 
 	for (int i = 0; i < 6; i++)

Modified: scummvm/trunk/engines/kyra/scene_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_lol.cpp	2009-12-13 20:31:07 UTC (rev 46365)
+++ scummvm/trunk/engines/kyra/scene_lol.cpp	2009-12-13 20:37:26 UTC (rev 46366)
@@ -1881,7 +1881,7 @@
 					horizontalFlip = true;
 				}
 
-				shift = _vcnShift? _vcnShift[remainder] : _blockBrightness;
+				shift = _vcnShift ? _vcnShift[remainder] : _blockBrightness;
 				src = &_vcnBlocks[remainder << 5];
 
 				if (horizontalFlip) {

Modified: scummvm/trunk/engines/kyra/sequences_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_lol.cpp	2009-12-13 20:31:07 UTC (rev 46365)
+++ scummvm/trunk/engines/kyra/sequences_lol.cpp	2009-12-13 20:37:26 UTC (rev 46366)
@@ -255,6 +255,7 @@
 
 	delete _tim;
 	_tim = 0;
+	_animator = 0;
 
 	_screen->fadePalette(_screen->getPalette(1), 30, 0);
 }
@@ -379,6 +380,7 @@
 
 	delete _tim;
 	_tim = 0;
+	_animator = 0;
 
 	return _charSelection;
 }
@@ -1144,6 +1146,8 @@
 	_tim->clearLangData();
 	delete _tim;
 	_tim = timBackUp;
+	_animator = 0;
+
 	setupEpilogueData(false);
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.