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

[Strangerke]

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

Summary:
705b48025b TUCKER: Reduce the scope of some variables
cf33c60282 TUCKER: Remove some useless modification of sprite state


Commit: 705b48025b9d62dc1d6edf90afaa0d4252340934
    https://github.com/scummvm/scummvm/commit/705b48025b9d62dc1d6edf90afaa0d4252340934
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-03-07T14:33:43+01:00

Commit Message:
TUCKER: Reduce the scope of some variables

Changed paths:
    engines/tucker/locations.cpp
    engines/tucker/tucker.cpp



diff --git a/engines/tucker/locations.cpp b/engines/tucker/locations.cpp
index 13d5f06..b53ed44 100644
--- a/engines/tucker/locations.cpp
+++ b/engines/tucker/locations.cpp
@@ -2354,7 +2354,6 @@ void TuckerEngine::execData3PreUpdate_locationNum53() {
 }
 
 void TuckerEngine::updateSprite_locationNum54(int i) {
-	int state = 3;
 	if (_flagsTable[141] == 2) {
 		_spritesTable[i].needUpdate = 0;
 		setCharacterAnimation(0, i);
@@ -2367,6 +2366,7 @@ void TuckerEngine::updateSprite_locationNum54(int i) {
 		setCharacterAnimation(2, i);
 		_flagsTable[141] = 3;
 	} else {
+		int state = 3;
 		if (_charSpeechSoundCounter > 0 && _actionCharacterNum == i) {
 			_spritesTable[i].needUpdate = 2;
 			state = (getRandomNumber() < 12000) ? 2 : 4;
diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp
index 7eb4856..0e11880 100644
--- a/engines/tucker/tucker.cpp
+++ b/engines/tucker/tucker.cpp
@@ -1831,14 +1831,16 @@ void TuckerEngine::rememberSpeechSound() {
 }
 
 void TuckerEngine::redrawPanelItems() {
-	const uint8 *src = 0;
-	uint8 *dst = 0;
-	int sz = 0;
 	if (_forceRedrawPanelItems || (_redrawPanelItemsCounter != 0 && _panelState == 0)) {
 		_forceRedrawPanelItems = false;
 		if (_redrawPanelItemsCounter > 0) {
 			--_redrawPanelItemsCounter;
 		}
+
+		const uint8 *src = 0;
+		uint8 *dst = 0;
+		int sz = 0;
+
 		switch (_panelState) {
 		case 0:
 			src = _panelGfxBuf;


Commit: cf33c6028292aea395017da78a6042d7b62fcad9
    https://github.com/scummvm/scummvm/commit/cf33c6028292aea395017da78a6042d7b62fcad9
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-03-07T14:35:56+01:00

Commit Message:
TUCKER: Remove some useless modification of sprite state

Changed paths:
    engines/tucker/locations.cpp



diff --git a/engines/tucker/locations.cpp b/engines/tucker/locations.cpp
index b53ed44..8163269 100644
--- a/engines/tucker/locations.cpp
+++ b/engines/tucker/locations.cpp
@@ -2371,7 +2371,6 @@ void TuckerEngine::updateSprite_locationNum54(int i) {
 			_spritesTable[i].needUpdate = 2;
 			state = (getRandomNumber() < 12000) ? 2 : 4;
 		} else if (_flagsTable[141] == 3) {
-			state = 3;
 			_flagsTable[141] = 0;
 			_flagsTable[224] = 1;
 			_spritesTable[i].counter = 0;
@@ -2380,11 +2379,9 @@ void TuckerEngine::updateSprite_locationNum54(int i) {
 				_csDataLoaded = false;
 			}
 		} else if (getRandomNumber() < 26000) {
-			state = 3;
 			_spritesTable[i].needUpdate = 0;
 			_spritesTable[i].updateDelay = 5;
 		} else {
-			state = 3;
 			_spritesTable[i].needUpdate = 0;
 		}
 		if (_inventoryItemsState[17] == 1) {