[Scummvm-cvs-logs] scummvm master -> cf73ee9939fae986db922a2551544277d8d48449

[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:
cf73ee9939 DREAMWEB: Fix multiple regressions in checkInside and loadCart


Commit: cf73ee9939fae986db922a2551544277d8d48449
    https://github.com/scummvm/scummvm/commit/cf73ee9939fae986db922a2551544277d8d48449
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-12-18T04:22:12-08:00

Commit Message:
DREAMWEB: Fix multiple regressions in checkInside and loadCart

Changed paths:
    engines/dreamweb/monitor.cpp
    engines/dreamweb/stubs.cpp



diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 577d570..0b126ee 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -405,8 +405,9 @@ void DreamGenContext::loadNews() {
 void DreamGenContext::loadCart() {
 	byte cartridgeId = 0;
 	uint16 objectIndex = findSetObject("INTF");
-	if (checkInside(objectIndex, 1) != kNumexobjects)
-		cartridgeId = getSetAd(objectIndex)->name[0] + 1;
+	uint16 cartridgeIndex = checkInside(objectIndex, 1);
+	if (cartridgeIndex != kNumexobjects)
+		cartridgeId = getExAd(cartridgeIndex)->id[3] + 1;
 
 	if (cartridgeId == 0)
 		data.word(kTextfile3) = standardLoad("DREAMWEB.T20"); // monitor file 20
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index bf29cd0..1c87a05 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1801,6 +1801,8 @@ bool DreamBase::isRyanHolding(const char *id) {
 
 void DreamGenContext::checkInside() {
 	cl = checkInside(al, ah);
+	es = data.word(kExtras);
+	bx = kExdata + cl * sizeof(DynObject);
 }
 
 uint16 DreamGenContext::checkInside(uint16 command, uint16 type) {