[Scummvm-cvs-logs] SF.net SVN: scummvm: [28720] scummvm/trunk/engines/saga/interface.cpp

[thebluegr at users.sourceforge.net]

Revision: 28720
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28720&view=rev
Author:   thebluegr
Date:     2007-08-25 05:49:03 -0700 (Sat, 25 Aug 2007)

Log Message:
-----------
Converse arrows scroll the conversation options correctly now

Modified Paths:
--------------
    scummvm/trunk/engines/saga/interface.cpp

Modified: scummvm/trunk/engines/saga/interface.cpp
===================================================================
--- scummvm/trunk/engines/saga/interface.cpp	2007-08-25 12:38:35 UTC (rev 28719)
+++ scummvm/trunk/engines/saga/interface.cpp	2007-08-25 12:49:03 UTC (rev 28720)
@@ -1914,7 +1914,6 @@
 
 	if ((panelButton != NULL) && (panelButton->type == kPanelButtonArrow)) {
 		if (panelButton->state == 1) {
-			//TODO: insert timeout catchup
 			inventoryChangePos(panelButton->id);
 		}
 		changed = true;
@@ -2524,11 +2523,14 @@
 }
 
 void Interface::converseChangePos(int chg) {
-	if ((chg < 0 && _converseStartPos + chg >= 0) ||
-		(chg > 0 && _converseStartPos < _converseEndPos)) {
-		_converseStartPos += chg;
-		draw();
+	// Arrows will scroll the converse panel or down up to 4 conversation options
+	for (int i = 1; i <= 4; i++) {
+		if ((chg < 0 && _converseStartPos + chg >= 0) ||
+			(chg > 0 && _converseStartPos < _converseEndPos)) {
+				_converseStartPos += chg;
+		}
 	}
+	draw();
 }
 
 void Interface::converseSetPos(int key) {
@@ -2581,7 +2583,6 @@
 
 	if (_conversePanel.currentButton->type == kPanelButtonArrow) {
 		if (_conversePanel.currentButton->state == 1) {
-			//TODO: insert timeout catchup
 			converseChangePos(_conversePanel.currentButton->id);
 		}
 		draw();


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