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

[athrxx at users.sourceforge.net]

Revision: 46587
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46587&view=rev
Author:   athrxx
Date:     2009-12-26 14:12:38 +0000 (Sat, 26 Dec 2009)

Log Message:
-----------
LOL: fixed minor bug in lamp code

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/lol.cpp
    scummvm/trunk/engines/kyra/lol.h
    scummvm/trunk/engines/kyra/scene_lol.cpp
    scummvm/trunk/engines/kyra/timer_lol.cpp

Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp	2009-12-26 14:03:13 UTC (rev 46586)
+++ scummvm/trunk/engines/kyra/lol.cpp	2009-12-26 14:12:38 UTC (rev 46587)
@@ -1705,7 +1705,7 @@
 	_screen->_fadeFlag = 0;
 }
 
-void LoLEngine::generateBrightnessPalette(const Palette &src, Palette &dst, int brightness, int modifier) {
+void LoLEngine::generateBrightnessPalette(const Palette &src, Palette &dst, int brightness, int16 modifier) {
 	dst.copy(src);
 	if (_flags.use16ColorMode) {
 		if (!brightness)

Modified: scummvm/trunk/engines/kyra/lol.h
===================================================================
--- scummvm/trunk/engines/kyra/lol.h	2009-12-26 14:03:13 UTC (rev 46586)
+++ scummvm/trunk/engines/kyra/lol.h	2009-12-26 14:12:38 UTC (rev 46587)
@@ -889,7 +889,7 @@
 	void fadeText();
 	void transformRegion(int x1, int y1, int x2, int y2, int w, int h, int srcPage, int dstPage);
 	void setPaletteBrightness(const Palette &srcPal, int brightness, int modifier);
-	void generateBrightnessPalette(const Palette &src, Palette &dst, int brightness, int modifier);
+	void generateBrightnessPalette(const Palette &src, Palette &dst, int brightness, int16 modifier);
 	void generateFlashPalette(const Palette &src, Palette &dst, int colorFlags);
 	void createTransparencyTables();
 	void updateSequenceBackgroundAnimations();
@@ -972,7 +972,7 @@
 	void setLampMode(bool lampOn);
 	void updateLampStatus();
 
-	int _lampEffect;
+	int8 _lampEffect;
 	int _brightness;
 	int _lampOilStatus;
 	uint32 _lampStatusTimer;

Modified: scummvm/trunk/engines/kyra/scene_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_lol.cpp	2009-12-26 14:03:13 UTC (rev 46586)
+++ scummvm/trunk/engines/kyra/scene_lol.cpp	2009-12-26 14:12:38 UTC (rev 46587)
@@ -596,7 +596,7 @@
 
 void LoLEngine::setLampMode(bool lampOn) {
 	_flagsTable[31] &= 0xFB;
-	if (!(_flagsTable[30] & 0x08) || !lampOn)
+	if (!(_flagsTable[31] & 0x08) || !lampOn)
 		return;
 
 	_screen->drawShape(0, _gameShapes[_flags.isTalkie ? 43 : 41], 291, 56, 0, 0);
@@ -604,7 +604,7 @@
 }
 
 void LoLEngine::updateLampStatus() {
-	uint8 newLampEffect = 0;
+	int8 newLampEffect = 0;
 	uint8 tmpOilStatus = 0;
 
 	if ((_updateFlags & 4) || !(_flagsTable[31] & 0x08))

Modified: scummvm/trunk/engines/kyra/timer_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/timer_lol.cpp	2009-12-26 14:03:13 UTC (rev 46586)
+++ scummvm/trunk/engines/kyra/timer_lol.cpp	2009-12-26 14:12:38 UTC (rev 46587)
@@ -245,7 +245,7 @@
 }
 
 void LoLEngine::timerUpdateLampState(int timerNum) {
-	if ((_flagsTable[31] & 0x08) && (_flagsTable[31] & 0x04) && _lampOilStatus > 0)
+	if ((_flagsTable[31] & 0x08) && (_flagsTable[31] & 0x04) && _brightness && _lampOilStatus)
 		_lampOilStatus--;
 }
 


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