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

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Sun Jun 21 21:49:20 CEST 2009


Revision: 41732
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41732&view=rev
Author:   lordhoto
Date:     2009-06-21 19:49:20 +0000 (Sun, 21 Jun 2009)

Log Message:
-----------
Fix slider buttons in LoL (and some minor cleanup).

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/gui_hof.cpp
    scummvm/trunk/engines/kyra/gui_lol.cpp
    scummvm/trunk/engines/kyra/gui_mr.cpp

Modified: scummvm/trunk/engines/kyra/gui_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_hof.cpp	2009-06-21 19:01:04 UTC (rev 41731)
+++ scummvm/trunk/engines/kyra/gui_hof.cpp	2009-06-21 19:49:20 UTC (rev 41732)
@@ -1098,8 +1098,7 @@
 	else
 		newVolume = _vm->_mouseX - caller->x - 7;
 
-	newVolume = MAX(2, newVolume);
-	newVolume = MIN(97, newVolume);
+	newVolume = CLIP(newVolume, 2, 97);
 
 	if (newVolume == oldVolume)
 		return 0;

Modified: scummvm/trunk/engines/kyra/gui_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_lol.cpp	2009-06-21 19:01:04 UTC (rev 41731)
+++ scummvm/trunk/engines/kyra/gui_lol.cpp	2009-06-21 19:49:20 UTC (rev 41732)
@@ -2670,7 +2670,7 @@
 	}
 
 	int tX = button->x;
-	int oldVolume = _vm->getVolume((KyraEngine_v1::kVolumeEntry)(button->arg - 3));
+	const int oldVolume = _vm->getVolume((KyraEngine_v1::kVolumeEntry)(button->arg - 3));
 	int newVolume = oldVolume;
 
 	if (button->index == 0) {
@@ -2689,7 +2689,9 @@
 		return 0;
 
 	_screen->drawShape(0, _vm->_gameShapes[87], tX + oldVolume, button->y, 0, 0x10);
-	_screen->drawShape(0, _vm->_gameShapes[86], tX + newVolume, button->y, 0, 0x10);
+	// Temporary HACK
+	const int volumeDrawX = _vm->convertValueFromMixer(_vm->convertValueToMixer(newVolume));
+	_screen->drawShape(0, _vm->_gameShapes[86], tX + volumeDrawX, button->y, 0, 0x10);
 	_screen->updateScreen();
 
 	_vm->snd_stopSpeech(0);

Modified: scummvm/trunk/engines/kyra/gui_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_mr.cpp	2009-06-21 19:01:04 UTC (rev 41731)
+++ scummvm/trunk/engines/kyra/gui_mr.cpp	2009-06-21 19:49:20 UTC (rev 41732)
@@ -1554,7 +1554,7 @@
 
 	assert(button >= 0 && button <= 3);
 
-	int oldVolume = _vm->getVolume(KyraEngine_v1::kVolumeEntry(button));
+	const int oldVolume = _vm->getVolume(KyraEngine_v1::kVolumeEntry(button));
 	int newVolume = oldVolume;
 
 	if (caller->index >= 24 && caller->index <= 27)
@@ -1564,8 +1564,7 @@
 	else
 		newVolume = _vm->_mouseX - caller->x - 7;
 
-	newVolume = MAX(2, newVolume);
-	newVolume = MIN(97, newVolume);
+	newVolume = CLIP(newVolume, 2, 97);
 
 	if (newVolume == oldVolume)
 		return 0;


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