[Scummvm-cvs-logs] scummvm master -> 4027e635d50b510e322480c039bcc39449d096df

bluegr md5 at scummvm.org
Tue Dec 27 01:43:57 CET 2011


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:
4027e635d5 DREAMWEB: Remove dead code


Commit: 4027e635d50b510e322480c039bcc39449d096df
    https://github.com/scummvm/scummvm/commit/4027e635d50b510e322480c039bcc39449d096df
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-26T16:42:33-08:00

Commit Message:
DREAMWEB: Remove dead code

Changed paths:
    engines/dreamweb/stubs.cpp
    engines/dreamweb/stubs.h
    engines/dreamweb/use.cpp



diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index c8aac95..dd49116 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -457,8 +457,6 @@ static const Atmosphere g_atmosphereList[] = {
 };
 
 void DreamGenContext::dreamweb() {
-	STACK_CHECK;
-
 	switch(engine->getLanguage()) {
 	case Common::EN_ANY:
 	case Common::EN_GRB:
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index ea3c171..c749693 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -43,7 +43,6 @@
 	uint8 printDirect(const uint8* string, uint16 x, uint16 y, uint8 maxWidth, bool centered) {
 		return DreamBase::printDirect(string, x, y, maxWidth, centered);
 	}
-	void width160();
 	bool checkIfPerson(uint8 x, uint8 y);
 	bool checkIfFree(uint8 x, uint8 y);
 	bool checkIfEx(uint8 x, uint8 y);
@@ -60,7 +59,6 @@
 	void look();
 	void autoLook();
 	void doLook();
-	void useKey();
 	void useObject();
 	void inventory();
 	void mainScreen();
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 3e38215..34c68cf 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1494,40 +1494,6 @@ void DreamBase::useAxe() {
 	removeObFromInv();
 }
 
-void DreamGenContext::useKey() {
-	switch(data.byte(kLocation)) {
-	case 5:
-	case 30:
-		if (data.byte(kMapx) == 22 && data.byte(kMapy) == 10) {
-			showPuzText(0, 300);
-			data.byte(kCounttoclose) = 100;
-			data.byte(kGetback) = 1;
-		} else {
-			// Wrong room
-			showPuzText(2, 200);
-			putBackObStuff();
-		}
-		break;
-	case 21:
-		if (data.byte(kMapx) == 11 && data.byte(kMapy) == 10) {
-			showPuzText(3, 300);
-			data.byte(kNewlocation) = 30;
-			al = 2;
-			fadeScreenDown();
-			showFirstUse();
-			putBackObStuff();
-		} else {
-			// Wrong room
-			showPuzText(2, 200);
-			putBackObStuff();
-		}
-	default:
-		showPuzText(1, 200);
-		putBackObStuff();
-		break;
-	}
-}
-
 void DreamBase::useHandle() {
 	SetObject *object = getSetAd(findSetObject("CUTW"));
 	if (object->mapad[0] == 255) {






More information about the Scummvm-git-logs mailing list