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

digitall dgturner at iee.org
Fri Nov 30 05:37:35 CET 2012


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:
bf876a13c6 DREAMWEB: Remove dead code functions and minor formatting cleanup.


Commit: bf876a13c62944742684fadc40817ec472a66e62
    https://github.com/scummvm/scummvm/commit/bf876a13c62944742684fadc40817ec472a66e62
Author: D G Turner (digitall at scummvm.org)
Date: 2012-11-29T20:35:54-08:00

Commit Message:
DREAMWEB: Remove dead code functions and minor formatting cleanup.

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



diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index dcf6a06..f7c42c0 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -752,7 +752,6 @@ public:
 	void showRyanPage();
 	void switchRyanOn();
 	void switchRyanOff();
-	void middlePanel();
 	void showDiary();
 	void readMouse();
 	uint16 readMouseState();
@@ -884,7 +883,6 @@ public:
 	void obsThatDoThings();
 	void describeOb();
 	void putBackObStuff();
-	void reExFromOpen();
 	void showDiaryPage();
 	void showDiaryKeys();
 	void dumpDiaryKeys();
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 1e84aba..5e1f89f 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -875,7 +875,7 @@ void DreamWebEngine::useOpened() {
 
 void DreamWebEngine::outOfOpen() {
 	if (_openedOb == 255)
-		return;	// cannot use opened object
+		return; // cannot use opened object
 
 	ObjectRef objectId = findOpenPos();
 
@@ -892,13 +892,10 @@ void DreamWebEngine::outOfOpen() {
 	}
 
 	if (_mouseButton == _oldButton)
-		return;	// notletgo4
+		return; // notletgo4
 
-	if (_mouseButton != 1) {
-		if (_mouseButton == 2)
-			reExFromOpen();
+	if (_mouseButton != 1)
 		return;
-	}
 
 	delPointer();
 	_pickUp = 1;
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index de21d8e..6ab0497 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -719,7 +719,6 @@ void DreamWebEngine::dreamweb() {
 		showGun();
 		fadeScreenDown();
 		hangOn(100);
-
 	}
 }
 
@@ -961,7 +960,6 @@ void DreamWebEngine::useTimedText() {
 }
 
 void DreamWebEngine::setupTimedTemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount) {
-
 	if (hasSpeech() && voiceIndex != 0) {
 		_speechLoaded = _sound->loadSpeech('T', voiceIndex, 'T', textIndex);
 		if (_speechLoaded)
@@ -2134,7 +2132,6 @@ void DreamWebEngine::workToScreenM() {
 }
 
 void DreamWebEngine::atmospheres() {
-
 	const Atmosphere *a = &g_atmosphereList[0];
 
 	for (; a->_location != 255; ++a) {
@@ -2416,10 +2413,6 @@ void DreamWebEngine::errorMessage3() {
 	delPointer();
 }
 
-void DreamWebEngine::reExFromOpen() {
-
-}
-
 void DreamWebEngine::putBackObStuff() {
 	createPanel();
 	showPanel();
@@ -2457,9 +2450,6 @@ void DreamWebEngine::examineInventory() {
 	workToScreenM();
 }
 
-void DreamWebEngine::middlePanel() {
-}
-
 void DreamWebEngine::underTextLine() {
 	if (_foreignRelease)
 		multiGet(_textUnder, _textAddressX, _textAddressY - 3, kUnderTextSizeX_f, kUnderTextSizeY_f);
@@ -2571,7 +2561,6 @@ void DreamWebEngine::madmanRun() {
 		_vars._lastWeapon = 8;
 }
 
-
 void DreamWebEngine::decide() {
 	setMode();
 	loadPalFromIFF();
@@ -2687,7 +2676,6 @@ void DreamWebEngine::getBack1() {
 		return;
 	}
 
-
 	commandOnlyCond(26, 202);
 
 	if (_mouseButton == _oldButton)
@@ -3013,7 +3001,6 @@ void DreamWebEngine::incRyanPage() {
 	showPointer();
 	workToScreen();
 	delPointer();
-
 }
 
 void DreamWebEngine::emergencyPurge() {






More information about the Scummvm-git-logs mailing list