- stop voice when skipping dialogue

- scroll 4 inventory items when right-clicking

svn-id: r12314

2 files changed, 12 insertions, 10 deletions

diff --git a/queen/logic.cpp b/queen/logic.cpp
index 2f0803ced8..84fb807bea 100644
--- a/queen/logic.cpp
+++ b/queen/logic.cpp
@@ -1026,17 +1026,18 @@ void Logic::inventoryDeleteItem(uint16 itemNum, bool refresh) {
 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();
 }
 
diff --git a/queen/talk.cpp b/queen/talk.cpp
index 0bb9c56a47..b200fa8e7f 100644
--- a/queen/talk.cpp
+++ b/queen/talk.cpp
@@ -908,6 +908,7 @@ void Talk::defaultAnimation(
 			// Skip through text more quickly
 			if (_vm->input()->keyVerb() == VERB_SKIP_TEXT) {
 				_vm->input()->clearKeyVerb();
+				_vm->sound()->stopSfx();
 				break;
 			}
 		}