[Scummvm-cvs-logs] scummvm master -> 510eb83aaccd4460887881bd373e403a4d0917cf

[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:
8467ea81c8 HOPKINS: Rename last vxx variables
510eb83aac HOPKINS: Simplify a couple of tests in SoundManager


Commit: 8467ea81c87448990da8726da2db76d28d90e131
    https://github.com/scummvm/scummvm/commit/8467ea81c87448990da8726da2db76d28d90e131
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-03-20T23:18:38-07:00

Commit Message:
HOPKINS: Rename last vxx variables

Changed paths:
    engines/hopkins/lines.cpp
    engines/hopkins/objects.cpp



diff --git a/engines/hopkins/lines.cpp b/engines/hopkins/lines.cpp
index 2a2d640..4e57f65 100644
--- a/engines/hopkins/lines.cpp
+++ b/engines/hopkins/lines.cpp
@@ -2067,15 +2067,15 @@ RouteItem *LinesManager::cityMapCarRoute(int x1, int y1, int x2, int y2) {
 			for (;;) {
 				curRouteX = _testRoute2[curRouteIdx]._x;
 				int curRouteY = _testRoute2[curRouteIdx]._y;
-				Directions v66 = _testRoute2[curRouteIdx]._dir;
+				Directions curRouteDir = _testRoute2[curRouteIdx]._dir;
 				curRouteIdx++;
 
 				if (checkCollisionLine(curRouteX, curRouteY, &arrDataIdx[DIR_UP], &arrLineIdx[DIR_UP], 0, _lastLine))
 					break;
 
-				_bestRoute[superRouteIdx].set(curRouteX, curRouteY, v66);
+				_bestRoute[superRouteIdx].set(curRouteX, curRouteY, curRouteDir);
 
-				_testRoute0[superRouteIdx].set(curRouteX, curRouteY, v66);
+				_testRoute0[superRouteIdx].set(curRouteX, curRouteY, curRouteDir);
 				superRouteIdx++;
 				if (curRouteX == -1)
 					break;;
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp
index e158e5e..0ceacdd 100644
--- a/engines/hopkins/objects.cpp
+++ b/engines/hopkins/objects.cpp
@@ -588,15 +588,15 @@ void ObjectsManager::displayBob(int idx) {
 		return;
 
 
-	int16 v9 = READ_LE_INT16(data + 2);
-	int16 v8 = READ_LE_INT16(data + 4);
+	int16 bobModeChange = READ_LE_INT16(data + 2);
+	int16 newField22 = READ_LE_INT16(data + 4);
 	// data[6] isn't used, read skipped
-	int16 v6 = READ_LE_INT16(data + 8);
+	int16 newField20 = READ_LE_INT16(data + 8);
 
-	if (!v9)
-		v9 = 1;
-	if (!v6)
-		v6 = -1;
+	if (!bobModeChange)
+		bobModeChange = 1;
+	if (!newField20)
+		newField20 = -1;
 
 	_bob[idx]._isSpriteFl = false;
 
@@ -610,9 +610,9 @@ void ObjectsManager::displayBob(int idx) {
 	_bob[idx]._bobMode = 10;
 	_bob[idx]._spriteData = _vm->_globals->Bank[bankIdx]._data;
 
-	_bob[idx]._bobModeChange = v9;
-	_bob[idx].field20 = v6;
-	_bob[idx].field22 = v8;
+	_bob[idx]._bobModeChange = bobModeChange;
+	_bob[idx].field20 = newField20;
+	_bob[idx].field22 = newField22;
 }
 
 void ObjectsManager::hideBob(int idx) {


Commit: 510eb83aaccd4460887881bd373e403a4d0917cf
    https://github.com/scummvm/scummvm/commit/510eb83aaccd4460887881bd373e403a4d0917cf
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-03-20T23:19:10-07:00

Commit Message:
HOPKINS: Simplify a couple of tests in SoundManager

Changed paths:
    engines/hopkins/sound.cpp



diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp
index b64430f..1605b03 100644
--- a/engines/hopkins/sound.cpp
+++ b/engines/hopkins/sound.cpp
@@ -732,10 +732,8 @@ void SoundManager::stopVoice(int voiceIndex) {
 	if (_voice[voiceIndex]._status) {
 		_voice[voiceIndex]._status = false;
 		int wavIndex = _voice[voiceIndex]._wavIndex;
-		if (_sWav[wavIndex]._active) {
-			if (_sWav[wavIndex]._freeSampleFl)
-				removeWavSample(wavIndex);
-		}
+		if (_sWav[wavIndex]._active && _sWav[wavIndex]._freeSampleFl)
+			removeWavSample(wavIndex);
 	}
 	_voice[voiceIndex]._status = false;
 }
@@ -802,21 +800,23 @@ void SoundManager::loadWav(const Common::String &file, int wavIndex) {
 }
 
 void SoundManager::playWav(int wavIndex) {
-	if (!_soundFl && !_soundOffFl) {
-		_soundFl = true;
-		_currentSoundIndex = wavIndex;
-		playWavSample(1, wavIndex);
-	}
+	if (_soundFl || _soundOffFl)
+		return;
+
+	_soundFl = true;
+	_currentSoundIndex = wavIndex;
+	playWavSample(1, wavIndex);
 }
 
 void SoundManager::delWav(int wavIndex) {
-	if (removeWavSample(wavIndex)) {
-		if (checkVoiceStatus(1))
-			stopVoice(1);
+	if (!removeWavSample(wavIndex))
+		return;
 
-		_currentSoundIndex = 0;
-		_soundFl = false;
-	}
+	if (checkVoiceStatus(1))
+		stopVoice(1);
+
+	_currentSoundIndex = 0;
+	_soundFl = false;
 }
 
 void SoundManager::playWavSample(int voiceIndex, int wavIndex) {