[Scummvm-cvs-logs] scummvm master -> 9194b23d5baf62e3fd549ad6d1cd31ebdc5597f3

[wjp]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9194b23d5b DREAMWEB: Fix regression in 'usecart'


Commit: 9194b23d5baf62e3fd549ad6d1cd31ebdc5597f3
    https://github.com/scummvm/scummvm/commit/9194b23d5baf62e3fd549ad6d1cd31ebdc5597f3
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-12-06T11:04:16-08:00

Commit Message:
DREAMWEB: Fix regression in 'usecart'

Changed paths:
    engines/dreamweb/use.cpp



diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 2f7e66c..fa23f1d 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -934,7 +934,7 @@ void DreamGenContext::useWinch() {
 	checkInside();
 
 	char id[4] = { 'F', 'U', 'S', 'E' };	// TODO: convert to string with trailing zero
-	if (cl == 114 || !compare(cl, 4, id)) {
+	if (cl == kNumexobjects || !compare(cl, 4, id)) {
 		// No winch
 		showFirstUse();
 		putBackObStuff();
@@ -973,7 +973,7 @@ void DreamGenContext::useCart() {
 		DynObject *exObject = getExAd(data.byte(kWithobject));
 		exObject->mapad[0] = 0;
 		removeSetObject(data.byte(kCommand));
-		placeSetObject(data.byte(kWithobject) + 1);
+		placeSetObject(data.byte(kCommand) + 1);
 		data.byte(kProgresspoints)++;
 		playChannel1(17);
 		showFirstUse();