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

[lordhoto at users.sourceforge.net]

Revision: 31753
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31753&view=rev
Author:   lordhoto
Date:     2008-04-27 07:03:51 -0700 (Sun, 27 Apr 2008)

Log Message:
-----------
- Fixed bug in itemInventoryMagic
- Fixed original game bug when creating item 7 (Bent nail-on-a-string), now it should award points when creating it with scene item and also in french version when creating it in inventory

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/items_v3.cpp

Modified: scummvm/trunk/engines/kyra/items_v3.cpp
===================================================================
--- scummvm/trunk/engines/kyra/items_v3.cpp	2008-04-27 12:40:56 UTC (rev 31752)
+++ scummvm/trunk/engines/kyra/items_v3.cpp	2008-04-27 14:03:51 UTC (rev 31753)
@@ -546,6 +546,12 @@
 		if (_lang != 1)
 			updateItemCommand(resItem, 3, 0xFF);
 
+		// Unlike the original we give points for when combining with scene items 
+		if (resItem == 7) {
+			updateScore(35, 100);
+			delay(60, true);
+		}
+
 		return true;
 	}
 
@@ -577,19 +583,6 @@
 		return true;
 	}
 
-	if (_mainCharacter.sceneId == 51 && queryGameFlag(0x19B) && !queryGameFlag(0x19C)
-		&& ((item == 63 && handItem == 56) || (item == 56 && handItem == 63))) {
-		if (queryGameFlag(0x1AC)) {
-			setGameFlag(0x19C);
-			setGameFlag(0x1AD);
-		} else {
-			setGameFlag(0x1AE);
-		}
-		
-		_timer->setCountdown(12, 1);
-		_timer->enable(12);
-	}
-
 	for (int i = 0; _itemMagicTable[i] != 0xFF; i += 4) {
 		if (_itemMagicTable[i+0] != handItem || _itemMagicTable[i+1] != item)
 			continue;
@@ -611,12 +604,13 @@
 			setHandItem(newItem);
 		_screen->showMouse();
 
-		if (_lang != 1) {
-			if (resItem == 7) {
-				updateScore(35, 100);
-				delay(60, true);
-			}
+		if (_lang != 1)
 			updateItemCommand(resItem, 3, 0xFF);
+
+		// Unlike the original we give points for every language
+		if (resItem == 7) {
+			updateScore(35, 100);
+			delay(60, true);
 		}
 
 		return true;


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