DREAMWEB: Added commandOnlyCond() method

1 files changed, 11 insertions, 45 deletions

diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index eaffad822d..2a31652ace 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -112,10 +112,7 @@ void DreamWebEngine::loadKeypad() {
 }
 
 void DreamWebEngine::quitKey() {
-	if (_commandType != 222) {
-		_commandType = 222;
-		commandOnly(4);
-	}
+	commandOnlyCond(4, 222);
 
 	if (_mouseButton != _oldButton && (_mouseButton & 1))
 		_getBack = 1;
@@ -177,11 +174,7 @@ void DreamWebEngine::buttonEnter() {
 }
 
 void DreamWebEngine::buttonPress(uint8 buttonId) {
-	uint8 commandType = 100 + buttonId;
-	if (_commandType != commandType) {
-		_commandType = commandType;
-		commandOnly(buttonId + 4);
-	}
+	commandOnlyCond(buttonId + 4, buttonId + 100);
 	if ((_mouseButton & 1) && (_mouseButton != _oldButton)) {
 		_pressed = buttonId;
 		_graphicPress = buttonId + 21;
@@ -338,10 +331,7 @@ void DreamWebEngine::nextFolder() {
 		blank();
 		return;
 	}
-	if (_commandType != 201) {
-		_commandType = 201;
-		commandOnly(16);
-	}
+	commandOnlyCond(16, 201);
 	if ((_mouseButton == 1) && (_mouseButton != _oldButton)) {
 		++_folderPage;
 		folderHints();
@@ -380,10 +370,7 @@ void DreamWebEngine::lastFolder() {
 		blank();
 		return;
 	}
-	if (_commandType != 202) {
-		_commandType = 202;
-		commandOnly(17);
-	}
+	commandOnlyCond(17, 202);
 
 	if ((_mouseButton == 1) && (_mouseButton != _oldButton)) {
 		--_folderPage;
@@ -564,10 +551,7 @@ void DreamWebEngine::quitSymbol() {
 		return;
 	};
 
-	if (_commandType != 222) {
-		_commandType = 222;
-		commandOnly(18);
-	}
+	commandOnlyCond(18, 222);
 
 	if (_mouseButton == _oldButton)
 		return;	// notqs
@@ -584,10 +568,7 @@ void DreamWebEngine::setTopLeft() {
 		return;
 	}
 
-	if (_commandType != 210) {
-		_commandType = 210;
-		commandOnly(19);
-	}
+	commandOnlyCond(19, 210);
 
 	if (_mouseButton != 0)
 		_symbolTopDir = -1;
@@ -599,10 +580,7 @@ void DreamWebEngine::setTopRight() {
 		return;
 	}
 
-	if (_commandType != 211) {
-		_commandType = 211;
-		commandOnly(20);
-	}
+	commandOnlyCond(20, 211);
 
 	if (_mouseButton != 0)
 		_symbolTopDir = +1;
@@ -614,10 +592,7 @@ void DreamWebEngine::setBotLeft() {
 		return;
 	}
 
-	if (_commandType != 212) {
-		_commandType = 212;
-		commandOnly(21);
-	}
+	commandOnlyCond(21, 212);
 
 	if (_mouseButton != 0)
 		_symbolBotDir = -1;
@@ -629,10 +604,7 @@ void DreamWebEngine::setBotRight() {
 		return;
 	}
 
-	if (_commandType != 213) {
-		_commandType = 213;
-		commandOnly(22);
-	}
+	commandOnlyCond(22, 213);
 
 	if (_mouseButton != 0)
 		_symbolBotDir = +1;
@@ -841,10 +813,7 @@ void DreamWebEngine::dumpDiaryKeys() {
 }
 
 void DreamWebEngine::diaryKeyP() {
-	if (_commandType != 214) {
-		_commandType = 214;
-		commandOnly(23);
-	}
+	commandOnlyCond(23, 214);
 
 	if (!_mouseButton ||
 		_oldButton == _mouseButton ||
@@ -861,10 +830,7 @@ void DreamWebEngine::diaryKeyP() {
 }
 
 void DreamWebEngine::diaryKeyN() {
-	if (_commandType != 213) {
-		_commandType = 213;
-		commandOnly(23);
-	}
+	commandOnlyCond(23, 213);
 
 	if (!_mouseButton ||
 		_oldButton == _mouseButton ||