[Scummvm-cvs-logs] CVS: scummvm/queen logic.cpp,1.167,1.168 talk.cpp,1.80,1.81

[Joost Peters]

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv30631/queen

Modified Files:
	logic.cpp talk.cpp 
Log Message:
- stop voice when skipping dialogue
- scroll 4 inventory items when right-clicking


Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -d -r1.167 -r1.168
--- logic.cpp	9 Jan 2004 13:36:37 -0000	1.167
+++ logic.cpp	11 Jan 2004 01:36:00 -0000	1.168
@@ -1026,17 +1026,18 @@
 void Logic::inventoryScroll(uint16 count, bool up) {
 	if (!(numItemsInventory() > 4))
 		return;
-
-	if (up) {
-		for (int i = 3; i > 0; i--)
-			_inventoryItem[i] = _inventoryItem[i - 1];
-		_inventoryItem[0] = previousInventoryItem(_inventoryItem[0]);
-	} else {
-		for (int i = 0; i < 3; i++)
-			_inventoryItem[i] = _inventoryItem[i + 1];
-		_inventoryItem[3] = nextInventoryItem(_inventoryItem[3]);		
+	while (count--) {
+		if (up) {
+			for (int i = 3; i > 0; i--)
+				_inventoryItem[i] = _inventoryItem[i - 1];
+			_inventoryItem[0] = previousInventoryItem(_inventoryItem[0]);
+		} else {
+			for (int i = 0; i < 3; i++)
+				_inventoryItem[i] = _inventoryItem[i + 1];
+			_inventoryItem[3] = nextInventoryItem(_inventoryItem[3]);		
+		}
 	}
-
+	
 	inventoryRefresh();
 }
 

Index: talk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/talk.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- talk.cpp	10 Jan 2004 21:56:47 -0000	1.80
+++ talk.cpp	11 Jan 2004 01:36:00 -0000	1.81
@@ -908,6 +908,7 @@
 			// Skip through text more quickly
 			if (_vm->input()->keyVerb() == VERB_SKIP_TEXT) {
 				_vm->input()->clearKeyVerb();
+				_vm->sound()->stopSfx();
 				break;
 			}
 		}