[Scummvm-cvs-logs] scummvm master -> 0c247b26b42ff3552eeeaced5a2f59fe520a213c

Strangerke Strangerke at scummvm.org
Sat Mar 8 18:38:45 CET 2014


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:
0c247b26b4 TUCKER: Some more renaming


Commit: 0c247b26b42ff3552eeeaced5a2f59fe520a213c
    https://github.com/scummvm/scummvm/commit/0c247b26b42ff3552eeeaced5a2f59fe520a213c
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-03-08T18:36:54+01:00

Commit Message:
TUCKER: Some more renaming

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



diff --git a/engines/tucker/locations.cpp b/engines/tucker/locations.cpp
index c6f727c..1d45ffe 100644
--- a/engines/tucker/locations.cpp
+++ b/engines/tucker/locations.cpp
@@ -33,8 +33,8 @@ static const int _data3UpdateLocation1_yTable[] = { 152,   8,  95 };
 void TuckerEngine::execData3PreUpdate_locationNum1() {
 	if (_flagsTable[1] == 1) {
 		_flagsTable[1] = 2;
-		_locationSoundsTable[3].type = 2;
-		startSound(_locationSoundsTable[3].offset, 3, _locationSoundsTable[3].volume);
+		_locationSoundsTable[3]._type = 2;
+		startSound(_locationSoundsTable[3]._offset, 3, _locationSoundsTable[3]._volume);
 	}
 	_mapSequenceFlagsLocationTable[0] = (_flagsTable[1] > 0) ? 1 : 0;
 	if (_updateLocationCounter == 0) {
@@ -66,7 +66,7 @@ void TuckerEngine::execData3PreUpdate_locationNum1Helper1() {
 		}
 	}
 	if (_updateLocationFlagsTable[0] == 1 && _updateLocationCounter == 0) {
-		setVolumeSound(12, _locationSoundsTable[12].volume);
+		setVolumeSound(12, _locationSoundsTable[12]._volume);
 	} else {
 		setVolumeSound(12, 0);
 	}
@@ -122,7 +122,7 @@ void TuckerEngine::execData3PostUpdate_locationNum1() {
 	if (_flagsTable[63] == 0) {
 		if (getRandomNumber() < 400) {
 			_flagsTable[63] = 1;
-			startSound(_locationSoundsTable[2].offset, 2, _locationSoundsTable[2].volume);
+			startSound(_locationSoundsTable[2]._offset, 2, _locationSoundsTable[2]._volume);
 		}
 	}
 	_locationHeightTable[1] = (_yPosCurrent > 104) ? 60 : 0;
@@ -199,7 +199,7 @@ void TuckerEngine::execData3PreUpdate_locationNum2() {
 				if (_updateLocationYPosTable2[i] > _updateLocationYMaxTable[i]) {
 					_updateLocationYPosTable2[i] = 0;
 					const int num = (getRandomNumber() < 16000) ? 2 : 3;
-					startSound(_locationSoundsTable[num].offset, num, _locationSoundsTable[num].volume);
+					startSound(_locationSoundsTable[num]._offset, num, _locationSoundsTable[num]._volume);
 				}
 			} else if (getRandomNumber() > 32000) {
 				const int num = getRandomNumber() / 8192;
@@ -375,7 +375,7 @@ void TuckerEngine::execData3PreUpdate_locationNum4() {
 	if (_flagsTable[6] == 0) {
 		setVolumeSound(0, 0);
 	} else {
-		setVolumeSound(0, _locationSoundsTable[0].volume);
+		setVolumeSound(0, _locationSoundsTable[0]._volume);
 	}
 }
 
@@ -384,12 +384,12 @@ void TuckerEngine::updateSprite_locationNum5_0() {
 	if (_spritesTable[0]._counter > 100) {
 		_spritesTable[0]._counter = 0;
 		_spritesTable[0]._state = 1;
-		_locationSoundsTable[1].type = 2;
-		startSound(_locationSoundsTable[1].offset, 1, _locationSoundsTable[1].volume);
+		_locationSoundsTable[1]._type = 2;
+		startSound(_locationSoundsTable[1]._offset, 1, _locationSoundsTable[1]._volume);
 	} else if (_spritesTable[0]._counter == 50) {
-		_locationSoundsTable[1].type = 2;
+		_locationSoundsTable[1]._type = 2;
 		_spritesTable[0]._state = 2;
-		startSound(_locationSoundsTable[1].offset, 1, _locationSoundsTable[1].volume);
+		startSound(_locationSoundsTable[1]._offset, 1, _locationSoundsTable[1]._volume);
 	} else {
 		_spritesTable[0]._state = -1;
 		if (isSoundPlaying(1)) {
@@ -500,24 +500,24 @@ void TuckerEngine::execData3PreUpdate_locationNum6Helper1() {
 		if (_flagsTable[26] == 1) {
 			if (_flagsTable[27] < 15) {
 				if (_flagsTable[27] == 0) {
-					startSound(_locationSoundsTable[2].offset, 2, _locationSoundsTable[2].volume);
-					startSound(_locationSoundsTable[1].offset, 1, _locationSoundsTable[1].volume);
+					startSound(_locationSoundsTable[2]._offset, 2, _locationSoundsTable[2]._volume);
+					startSound(_locationSoundsTable[1]._offset, 1, _locationSoundsTable[1]._volume);
 				}
 				++_flagsTable[27];
-				setVolumeSound(0, _locationSoundsTable[0].volume - _flagsTable[27] * 5);
-				setVolumeMusic(0, _locationMusicsTable[0].volume - _flagsTable[27] * 5);
+				setVolumeSound(0, _locationSoundsTable[0]._volume - _flagsTable[27] * 5);
+				setVolumeMusic(0, _locationMusicsTable[0]._volume - _flagsTable[27] * 5);
 			}
 		} else if (_flagsTable[26] == 3) {
 			if (_flagsTable[27] > 0) {
 				if (_flagsTable[27] == 15) {
-					startSound(_locationSoundsTable[2].offset, 2, _locationSoundsTable[2].volume);
+					startSound(_locationSoundsTable[2]._offset, 2, _locationSoundsTable[2]._volume);
 				}
 				--_flagsTable[27];
-				setVolumeSound(0, _locationSoundsTable[0].volume - _flagsTable[27] * 5);
-				setVolumeMusic(0, _locationMusicsTable[0].volume - _flagsTable[27] * 5);
+				setVolumeSound(0, _locationSoundsTable[0]._volume - _flagsTable[27] * 5);
+				setVolumeMusic(0, _locationMusicsTable[0]._volume - _flagsTable[27] * 5);
 				int volume = _flagsTable[27];
-				if (volume < _locationSoundsTable[1].volume) {
-					volume = _locationSoundsTable[1].volume;
+				if (volume < _locationSoundsTable[1]._volume) {
+					volume = _locationSoundsTable[1]._volume;
 				}
 				setVolumeSound(1, volume);
 			}
@@ -662,7 +662,7 @@ void TuckerEngine::execData3PostUpdate_locationNum8() {
 		_updateLocationYPosTable2[0] += 2;
 		if (_updateLocationYPosTable2[0] > 120) {
 			_updateLocationYPosTable2[0] = 0;
-			startSound(_locationSoundsTable[2].offset, 2, _locationSoundsTable[2].volume);
+			startSound(_locationSoundsTable[2]._offset, 2, _locationSoundsTable[2]._volume);
 		}
 	}
 	if (_flagsTable[28] > 1 && _flagsTable[28] < 5) {
@@ -711,20 +711,20 @@ void TuckerEngine::execData3PreUpdate_locationNum9() {
 	if (_flagsTable[7] < 2) {
 		_flagsTable[7] = 2;
 	}
-	if (_flagsTable[8] == 0 && _locationMusicsTable[0].volume != 0) {
-		_locationMusicsTable[0].volume = 0;
+	if (_flagsTable[8] == 0 && _locationMusicsTable[0]._volume != 0) {
+		_locationMusicsTable[0]._volume = 0;
 	} else {
-		_locationMusicsTable[0].volume = _xPosCurrent / 40;
+		_locationMusicsTable[0]._volume = _xPosCurrent / 40;
 	}
-	setVolumeMusic(0, _locationMusicsTable[0].volume);
+	setVolumeMusic(0, _locationMusicsTable[0]._volume);
 	if (!isSoundPlaying(1) && getRandomNumber() > 32000) {
 		int i = getRandomNumber() / 5500 + 3;
 		assert(i >= 0 && i < kLocationSoundsTableSize);
-		startSound(_locationSoundsTable[i].offset, i, _locationSoundsTable[i].volume);
+		startSound(_locationSoundsTable[i]._offset, i, _locationSoundsTable[i]._volume);
 	}
 	if (_flagsTable[8] == 2 && _locationMaskType == 0) {
 		_flagsTable[8] = 0;
-		startSound(_locationSoundsTable[7].offset, 7, _locationSoundsTable[7].volume);
+		startSound(_locationSoundsTable[7]._offset, 7, _locationSoundsTable[7]._volume);
 	}
 }
 
@@ -798,7 +798,7 @@ void TuckerEngine::execData3PreUpdate_locationNum10() {
 		_flagsTable[47] = 2;
 	}
 	if (_spritesTable[0]._state == 6 && _spritesTable[0]._animationFrame == 18 && !isSoundPlaying(0)) {
-		startSound(_locationSoundsTable[0].offset, 0, _locationSoundsTable[0].volume);
+		startSound(_locationSoundsTable[0]._offset, 0, _locationSoundsTable[0]._volume);
 	}
 	if (_flagsTable[230] == 1 && getRandomNumber() > 32000) {
 		_flagsTable[230] = 0;
@@ -851,7 +851,7 @@ void TuckerEngine::updateSprite_locationNum11_3(int i) {
 void TuckerEngine::updateSprite_locationNum11_4(int i) {
 	if (getRandomNumber() > 30000 && _flagsTable[55] < 2) {
 		_spritesTable[i]._state = 1;
-		startSound(_locationSoundsTable[6].offset, 6, _locationSoundsTable[6].volume);
+		startSound(_locationSoundsTable[6]._offset, 6, _locationSoundsTable[6]._volume);
 	} else {
 		_spritesTable[i]._state = -1;
 	}
@@ -899,13 +899,13 @@ void TuckerEngine::execData3PreUpdate_locationNum12() {
 		_flagsTable[38] = 1;
 	}
 	if (_flagsTable[41] == 0) {
-		if (_locationMusicsTable[0].volume != 100) {
-			_locationMusicsTable[0].volume = 100;
+		if (_locationMusicsTable[0]._volume != 100) {
+			_locationMusicsTable[0]._volume = 100;
 			setVolumeMusic(0, 100);
 		}
 	} else {
-		if (_locationMusicsTable[0].volume != 20) {
-			_locationMusicsTable[0].volume = 20;
+		if (_locationMusicsTable[0]._volume != 20) {
+			_locationMusicsTable[0]._volume = 20;
 			setVolumeMusic(0, 20);
 		}
 	}
@@ -940,7 +940,7 @@ void TuckerEngine::execData3PreUpdate_locationNum13() {
 	if (_flagsTable[69] == 0) {
 		if (getRandomNumber() > 31000) {
 			_flagsTable[69] = 1;
-			startSound(_locationSoundsTable[1].offset, 1, _locationSoundsTable[1].volume);
+			startSound(_locationSoundsTable[1]._offset, 1, _locationSoundsTable[1]._volume);
 		} else if (isSoundPlaying(1)) {
 			stopSound(1);
 		}
@@ -949,7 +949,7 @@ void TuckerEngine::execData3PreUpdate_locationNum13() {
 	if (_spritesTable[0]._state == 1) {
 		if (_spritesTable[0]._animationFrame > 10 && _spritesTable[0]._animationFrame < 20) {
 			if (!isSoundPlaying(0)) {
-				startSound(_locationSoundsTable[0].offset, 0, _locationSoundsTable[0].volume);
+				startSound(_locationSoundsTable[0]._offset, 0, _locationSoundsTable[0]._volume);
 			}
 		}
 	}
@@ -988,7 +988,7 @@ void TuckerEngine::execData3PreUpdate_locationNum14() {
 			num = 7;
 		}
 		if (num != -1) {
-			startSound(_locationSoundsTable[num].offset, num, _locationSoundsTable[num].volume);
+			startSound(_locationSoundsTable[num]._offset, num, _locationSoundsTable[num]._volume);
 		}
 	}
 	_locationHeightTable[14] = (_xPosCurrent < 100) ? 0 : 60;
@@ -1106,7 +1106,7 @@ void TuckerEngine::execData3PreUpdate_locationNum15() {
 	if (_updateLocationFadePaletteCounter > 500) {
 		if (!isSoundPlaying(1) && getRandomNumber() > 31000) {
 			const int i = getRandomNumber() / 4714;
-			startSound(_locationSoundsTable[i].offset, i, _locationSoundsTable[i].volume);
+			startSound(_locationSoundsTable[i]._offset, i, _locationSoundsTable[i]._volume);
 			_updateLocationFadePaletteCounter = 0;
 		}
 	}
@@ -1164,14 +1164,14 @@ void TuckerEngine::updateSprite_locationNum16_1(int i) {
 	} else if (_flagsTable[60] == 0) {
 		state = 10;
 		if (isSoundPlaying(1)) {
-			_locationSoundsTable[1].type = 2;
-			startSound(_locationSoundsTable[1].offset, 1, _locationSoundsTable[1].volume);
+			_locationSoundsTable[1]._type = 2;
+			startSound(_locationSoundsTable[1]._offset, 1, _locationSoundsTable[1]._volume);
 		}
 	} else {
 		state = 9;
 		if (isSoundPlaying(0)) {
-			_locationSoundsTable[0].type = 2;
-			startSound(_locationSoundsTable[0].offset, 0, _locationSoundsTable[0].volume);
+			_locationSoundsTable[0]._type = 2;
+			startSound(_locationSoundsTable[0]._offset, 0, _locationSoundsTable[0]._volume);
 		}
 	}
 	_spritesTable[i]._state = state;
@@ -1183,7 +1183,7 @@ void TuckerEngine::updateSprite_locationNum16_2(int i) {
 	if (_flagsTable[78] == 0) {
 		if (_flagsTable[60] == 1 && _flagsTable[61] == 1) {
 			_flagsTable[78] = 1;
-			startSound(_locationSoundsTable[5].offset, 5, _locationSoundsTable[5].volume);
+			startSound(_locationSoundsTable[5]._offset, 5, _locationSoundsTable[5]._volume);
 			state = 7;
 		}
 	} else if (_flagsTable[78] == 1) {
@@ -1313,11 +1313,11 @@ void TuckerEngine::updateSprite_locationNum21() {
 	} else if (_flagsTable[58] == 3) {
 		state = 6;
 		_flagsTable[58] = 4;
-		_locationSoundsTable[0].volume = 60;
-		_locationSoundsTable[5].volume = 60;
+		_locationSoundsTable[0]._volume = 60;
+		_locationSoundsTable[5]._volume = 60;
 	} else if (_flagsTable[58] == 4) {
 		state = 7;
-		_locationSoundsTable[4].volume = 60;
+		_locationSoundsTable[4]._volume = 60;
 	} else if (_flagsTable[59] == 4) {
 		_spritesTable[0]._needUpdate = true;
 		_flagsTable[59] = 2;
@@ -1326,7 +1326,7 @@ void TuckerEngine::updateSprite_locationNum21() {
 	} else if (_flagsTable[59] == 3) {
 		_flagsTable[59] = 0;
 		state = 4;
-		setVolumeSound(2, _locationSoundsTable[2].volume);
+		setVolumeSound(2, _locationSoundsTable[2]._volume);
 	} else if (_charSpeechSoundCounter > 0 && _actionCharacterNum == 0) {
 		_spritesTable[0]._needUpdate = true;
 		state = 3;
@@ -1364,7 +1364,7 @@ void TuckerEngine::execData3PreUpdate_locationNum21() {
 			} else {
 				num = 5;
 			}
-			startSound(_locationSoundsTable[num].offset, num, _locationSoundsTable[num].volume);
+			startSound(_locationSoundsTable[num]._offset, num, _locationSoundsTable[num]._volume);
 		}
 	}
 	if (_spritesTable[0]._state == 6) {
@@ -1645,8 +1645,8 @@ void TuckerEngine::execData3PreUpdate_locationNum26() {
 	_spritesTable[0]._gfxBackgroundOffset = _flagsTable[125];
 	if (_flagsTable[125] > 0 && _flagsTable[125] < 300) {
 		if (!isSoundPlaying(5)) {
-			startSound(_locationSoundsTable[5].offset, 5, _locationSoundsTable[5].volume);
-			startSound(_locationSoundsTable[6].offset, 6, _locationSoundsTable[6].volume);
+			startSound(_locationSoundsTable[5]._offset, 5, _locationSoundsTable[5]._volume);
+			startSound(_locationSoundsTable[6]._offset, 6, _locationSoundsTable[6]._volume);
 		}
 		++_flagsTable[125];
 		_flagsTable[126] = 1;
@@ -1797,11 +1797,11 @@ void TuckerEngine::execData3PreUpdate_locationNum29() {
 		}
 		_system->getPaletteManager()->setPalette(scrollPal, 118, 5);
 		if (_flagsTable[143] == 1) {
-			_locationObjectsTable[2].xPos = 999;
-			_locationObjectsTable[3].xPos = 187;
+			_locationObjectsTable[2]._xPos = 999;
+			_locationObjectsTable[3]._xPos = 187;
 		} else {
-			_locationObjectsTable[2].xPos = 187;
-			_locationObjectsTable[3].xPos = 999;
+			_locationObjectsTable[2]._xPos = 187;
+			_locationObjectsTable[3]._xPos = 999;
 		}
 	}
 }
@@ -1812,7 +1812,7 @@ void TuckerEngine::updateSprite_locationNum30_34(int i) {
 
 void TuckerEngine::execData3PreUpdate_locationNum30() {
 	if (!isSoundPlaying(1) && getRandomNumber() > 32500) {
-		startSound(_locationSoundsTable[1].offset, 1, _locationSoundsTable[1].volume);
+		startSound(_locationSoundsTable[1]._offset, 1, _locationSoundsTable[1]._volume);
 	}
 }
 
@@ -1928,30 +1928,30 @@ void TuckerEngine::execData3PreUpdate_locationNum33() {
 	if (_xPosCurrent < 90) {
 		if (_flagsTable[105] == 0) {
 			_flagsTable[105] = 3;
-			startSound(_locationSoundsTable[5].offset, 5, _locationSoundsTable[5].volume);
+			startSound(_locationSoundsTable[5]._offset, 5, _locationSoundsTable[5]._volume);
 		}
 	} else {
 		if (_flagsTable[105] == 1) {
 			_flagsTable[105] = 2;
-			startSound(_locationSoundsTable[5].offset, 5, _locationSoundsTable[5].volume);
+			startSound(_locationSoundsTable[5]._offset, 5, _locationSoundsTable[5]._volume);
 		}
 	}
 	if (_xPosCurrent > 230) {
 		if (_flagsTable[106] == 0) {
 			_flagsTable[106] = 3;
-			startSound(_locationSoundsTable[5].offset, 5, _locationSoundsTable[5].volume);
+			startSound(_locationSoundsTable[5]._offset, 5, _locationSoundsTable[5]._volume);
 		}
 	} else {
 		if (_flagsTable[106] == 1) {
 			_flagsTable[106] = 2;
-			startSound(_locationSoundsTable[5].offset, 5, _locationSoundsTable[5].volume);
+			startSound(_locationSoundsTable[5]._offset, 5, _locationSoundsTable[5]._volume);
 		}
 	}
 }
 
 void TuckerEngine::execData3PreUpdate_locationNum34() {
 	if (_flagsTable[143] == 1) {
-		_locationObjectsTable[0].xPos = 0;
+		_locationObjectsTable[0]._xPos = 0;
 	}
 }
 
@@ -2022,8 +2022,8 @@ void TuckerEngine::execData3PreUpdate_locationNum41() {
 		}
 		if (!_changeBackgroundSprite) {
 			if (_backgroundSpriteCurrentFrame == 16 && !isSoundPlaying(4)) {
-				_locationSoundsTable[4].type = 2;
-				startSound(_locationSoundsTable[4].offset, 4, _locationSoundsTable[4].volume);
+				_locationSoundsTable[4]._type = 2;
+				startSound(_locationSoundsTable[4]._offset, 4, _locationSoundsTable[4]._volume);
 			} else {
 				if (_backgroundSpriteCurrentFrame == 28) {
 					stopSound(4);
@@ -2031,8 +2031,8 @@ void TuckerEngine::execData3PreUpdate_locationNum41() {
 			}
 		} else {
 			if (_backgroundSpriteCurrentFrame == 28 && !isSoundPlaying(4)) {
-				_locationSoundsTable[4].type = 2;
-				startSound(_locationSoundsTable[4].offset, 4, _locationSoundsTable[4].volume);
+				_locationSoundsTable[4]._type = 2;
+				startSound(_locationSoundsTable[4]._offset, 4, _locationSoundsTable[4]._volume);
 			} else {
 				if (_backgroundSpriteCurrentFrame == 18) {
 					stopSound(4);
@@ -2057,9 +2057,9 @@ void TuckerEngine::execData3PreUpdate_locationNum41() {
 			}
 		}
 		if (_flagsTable[77] == 0) {
-			_locationObjectsTable[3].xPos = 230;
+			_locationObjectsTable[3]._xPos = 230;
 		} else {
-			_locationObjectsTable[3].xPos = 930;
+			_locationObjectsTable[3]._xPos = 930;
 		}
 	}
 }
@@ -2158,8 +2158,8 @@ void TuckerEngine::execData3PreUpdate_locationNum43() {
 void TuckerEngine::execData3PreUpdate_locationNum44() {
 	if (_backgroundSpriteCurrentAnimation == 1) {
 		if (!isSoundPlaying(3) && _backgroundSpriteCurrentFrame == 1) {
-			_locationSoundsTable[3].type = 2;
-			startSound(_locationSoundsTable[3].offset, 3, _locationSoundsTable[3].volume);
+			_locationSoundsTable[3]._type = 2;
+			startSound(_locationSoundsTable[3]._offset, 3, _locationSoundsTable[3]._volume);
 		}
 		if (_backgroundSpriteCurrentFrame == 21) {
 			_flagsTable[77] = 1;
@@ -2169,7 +2169,7 @@ void TuckerEngine::execData3PreUpdate_locationNum44() {
 		}
 	} else if (_backgroundSpriteCurrentAnimation == 4) {
 		if (_backgroundSpriteCurrentFrame == 20 && !isSoundPlaying(3)) {
-			startSound(_locationSoundsTable[3].offset, 3, _locationSoundsTable[3].volume);
+			startSound(_locationSoundsTable[3]._offset, 3, _locationSoundsTable[3]._volume);
 		}
 	}
 }
@@ -2479,10 +2479,10 @@ void TuckerEngine::execData3PreUpdate_locationNum58() {
 		_xPosCurrent = 310;
 		_panelLockedFlag = 0;
 	}
-	if (_flagsTable[190] > 0 && _locationSoundsTable[0].volume > 0) {
-		_locationSoundsTable[0].volume = 0;
-		_locationSoundsTable[4].volume = 0;
-		_locationSoundsTable[5].volume = 0;
+	if (_flagsTable[190] > 0 && _locationSoundsTable[0]._volume > 0) {
+		_locationSoundsTable[0]._volume = 0;
+		_locationSoundsTable[4]._volume = 0;
+		_locationSoundsTable[5]._volume = 0;
 		if (isSoundPlaying(0)) {
 			stopSound(0);
 		}
@@ -2761,8 +2761,8 @@ void TuckerEngine::execData3PreUpdate_locationNum63() {
 	} else {
 		if (_flagsTable[132] == 0 || (_flagsTable[132] == 2 && _flagsTable[136] > 0)) {
 			if (!isSoundPlaying(1)) {
-				_locationSoundsTable[1].type = 2;
-				startSound(_locationSoundsTable[1].offset, 1, _locationSoundsTable[1].volume);
+				_locationSoundsTable[1]._type = 2;
+				startSound(_locationSoundsTable[1]._offset, 1, _locationSoundsTable[1]._volume);
 			}
 		} else {
 			if (isSoundPlaying(1)) {
@@ -2771,8 +2771,8 @@ void TuckerEngine::execData3PreUpdate_locationNum63() {
 		}
 		if (_flagsTable[132] == 1) {
 			if (!isSoundPlaying(0)) {
-				_locationSoundsTable[0].type = 2;
-				startSound(_locationSoundsTable[0].offset, 0, _locationSoundsTable[0].volume);
+				_locationSoundsTable[0]._type = 2;
+				startSound(_locationSoundsTable[0]._offset, 0, _locationSoundsTable[0]._volume);
 			}
 		} else {
 			if (isSoundPlaying(0)) {
@@ -2781,7 +2781,7 @@ void TuckerEngine::execData3PreUpdate_locationNum63() {
 		}
 		if (_flagsTable[132] == 2 && _flagsTable[136] == 0) {
 			if (!isSoundPlaying(2)) {
-				startSound(_locationSoundsTable[2].offset, 2, _locationSoundsTable[2].volume);
+				startSound(_locationSoundsTable[2]._offset, 2, _locationSoundsTable[2]._volume);
 			}
 		} else {
 			if (isSoundPlaying(2)) {
@@ -3008,7 +3008,7 @@ void TuckerEngine::updateSprite_locationNum69_3(int i) {
 void TuckerEngine::execData3PreUpdate_locationNum70() {
 	const uint8 color = 103;
 	if (_execData3Counter == 0) {
-		startSound(_locationSoundsTable[6].offset, 6, _locationSoundsTable[6].volume);
+		startSound(_locationSoundsTable[6]._offset, 6, _locationSoundsTable[6]._volume);
 		_execData3Counter = 1;
 		_flagsTable[143] = 0;
 		_updateLocation70StringLen = 0;
@@ -3038,7 +3038,7 @@ void TuckerEngine::execData3PreUpdate_locationNum70Helper() {
 		if (_lastKeyPressed == Common::KEYCODE_BACKSPACE || _lastKeyPressed == Common::KEYCODE_DELETE) {
 			if (_updateLocation70StringLen > 0) {
 				--_updateLocation70StringLen;
-				startSound(_locationSoundsTable[0].offset, 0, _locationSoundsTable[0].volume);
+				startSound(_locationSoundsTable[0]._offset, 0, _locationSoundsTable[0]._volume);
 			}
 		} else if (_lastKeyPressed == Common::KEYCODE_RETURN) {
 			_flagsTable[143] = 1;
@@ -3049,7 +3049,7 @@ void TuckerEngine::execData3PreUpdate_locationNum70Helper() {
 				_flagsTable[143] = 2;
 			}
 			const int num = (_flagsTable[143] == 1) ? 4 : 5;
-			startSound(_locationSoundsTable[num].offset, num, _locationSoundsTable[num].volume);
+			startSound(_locationSoundsTable[num]._offset, num, _locationSoundsTable[num]._volume);
 		} else if (_updateLocation70StringLen < 19) {
 			uint8 chr = 0;
 			switch (_lastKeyPressed) {
@@ -3086,7 +3086,7 @@ void TuckerEngine::execData3PreUpdate_locationNum70Helper() {
 				}
 				break;
 			}
-			startSound(_locationSoundsTable[0].offset, 0, _locationSoundsTable[0].volume);
+			startSound(_locationSoundsTable[0]._offset, 0, _locationSoundsTable[0]._volume);
 			if (chr > 0) {
 				_updateLocation70String[_updateLocation70StringLen] = chr;
 				++_updateLocation70StringLen;
diff --git a/engines/tucker/resource.cpp b/engines/tucker/resource.cpp
index b9aa111..b031152 100644
--- a/engines/tucker/resource.cpp
+++ b/engines/tucker/resource.cpp
@@ -673,22 +673,22 @@ void TuckerEngine::loadData4() {
 			}
 			assert(_locationObjectsCount < kLocationObjectsTableSize);
 			LocationObject *d = &_locationObjectsTable[_locationObjectsCount++];
-			d->xPos = i;
-			d->yPos = t.getNextInteger();
-			d->xSize = t.getNextInteger();
-			d->ySize = t.getNextInteger();
-			d->standX = t.getNextInteger();
-			d->standY = t.getNextInteger();
-			d->textNum = t.getNextInteger();
-			d->cursorNum = t.getNextInteger();
-			d->locationNum = t.getNextInteger();
-			if (d->locationNum > 0) {
-				d->toX = t.getNextInteger();
-				d->toY = t.getNextInteger();
-				d->toX2 = t.getNextInteger();
-				d->toY2 = t.getNextInteger();
-				d->toWalkX2 = t.getNextInteger();
-				d->toWalkY2 = t.getNextInteger();
+			d->_xPos = i;
+			d->_yPos = t.getNextInteger();
+			d->_xSize = t.getNextInteger();
+			d->_ySize = t.getNextInteger();
+			d->_standX = t.getNextInteger();
+			d->_standY = t.getNextInteger();
+			d->_textNum = t.getNextInteger();
+			d->_cursorNum = t.getNextInteger();
+			d->_locationNum = t.getNextInteger();
+			if (d->_locationNum > 0) {
+				d->_toX = t.getNextInteger();
+				d->_toY = t.getNextInteger();
+				d->_toX2 = t.getNextInteger();
+				d->_toY2 = t.getNextInteger();
+				d->_toWalkX2 = t.getNextInteger();
+				d->_toWalkY2 = t.getNextInteger();
 			}
 		}
 	}
@@ -857,35 +857,35 @@ void TuckerEngine::loadFx() {
 	_currentFxSet = 0;
 	for (int i = 0; i < _locationSoundsCount; ++i) {
 		LocationSound *s = &_locationSoundsTable[i];
-		s->offset = 0;
-		s->num = t.getNextInteger();
-		s->volume = t.getNextInteger();
-		s->type = t.getNextInteger();
-		switch (s->type) {
+		s->_offset = 0;
+		s->_num = t.getNextInteger();
+		s->_volume = t.getNextInteger();
+		s->_type = t.getNextInteger();
+		switch (s->_type) {
 		case 5:
 			_currentFxSet = 1;
 			_currentFxIndex = i;
-			_currentFxVolume = s->volume;
+			_currentFxVolume = s->_volume;
 			_currentFxDist = t.getNextInteger();
 			_currentFxScale = t.getNextInteger();
 			break;
 		case 6:
 		case 7:
 		case 8:
-			s->startFxSpriteState = t.getNextInteger();
-			s->startFxSpriteNum = t.getNextInteger();
-			s->updateType = t.getNextInteger();
-			if (s->type == 7) {
-				s->flagNum = t.getNextInteger();
-				s->flagValueStartFx = t.getNextInteger();
-				s->stopFxSpriteState = t.getNextInteger();
-				s->stopFxSpriteNum = t.getNextInteger();
-				s->flagValueStopFx = t.getNextInteger();
+			s->_startFxSpriteState = t.getNextInteger();
+			s->_startFxSpriteNum = t.getNextInteger();
+			s->_updateType = t.getNextInteger();
+			if (s->_type == 7) {
+				s->_flagNum = t.getNextInteger();
+				s->_flagValueStartFx = t.getNextInteger();
+				s->_stopFxSpriteState = t.getNextInteger();
+				s->_stopFxSpriteNum = t.getNextInteger();
+				s->_flagValueStopFx = t.getNextInteger();
 			}
 			break;
 		}
-		if (s->type == 8) {
-			s->type = 6;
+		if (s->_type == 8) {
+			s->_type = 6;
 		}
 	}
 	t.findNextToken(kDataTokenDw);
@@ -896,10 +896,10 @@ void TuckerEngine::loadFx() {
 		int flagValue = t.getNextInteger();
 		if (flagValue == _flagsTable[flagNum]) {
 			LocationMusic *m = &_locationMusicsTable[_locationMusicsCount++];
-			m->offset = 0;
-			m->num = t.getNextInteger();
-			m->volume = t.getNextInteger();
-			m->flag = t.getNextInteger();
+			m->_offset = 0;
+			m->_num = t.getNextInteger();
+			m->_volume = t.getNextInteger();
+			m->_flag = t.getNextInteger();
 		} else {
 			for (int j = 0; j < 3; ++j) {
 				t.getNextInteger();
diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp
index 1f4d8fa..33884da 100644
--- a/engines/tucker/tucker.cpp
+++ b/engines/tucker/tucker.cpp
@@ -524,7 +524,7 @@ void TuckerEngine::mainLoop() {
 				--_miscSoundFxDelayCounter[num];
 				if (_miscSoundFxDelayCounter[num] == 0) {
 					const int index = _miscSoundFxNum[num];
-					startSound(_locationSoundsTable[index].offset, index, _locationSoundsTable[index].volume);
+					startSound(_locationSoundsTable[index]._offset, index, _locationSoundsTable[index]._volume);
 				}
 			}
 		}
@@ -1018,7 +1018,7 @@ void TuckerEngine::updateCursor() {
 	} else {
 		num = getObjectUnderCursor();
 		if (num > -1) {
-			_selectedObjectNum = _locationObjectsTable[num].textNum;
+			_selectedObjectNum = _locationObjectsTable[num]._textNum;
 		}
 	}
 	handleMouseClickOnInventoryObject();
@@ -1094,14 +1094,14 @@ void TuckerEngine::stopSounds() {
 
 void TuckerEngine::playSounds() {
 	for (int i = 0; i < _locationSoundsCount; ++i) {
-		if (_locationSoundsTable[i].type == 1 || _locationSoundsTable[i].type == 2 || _locationSoundsTable[i].type == 5 ||
-			(_locationSoundsTable[i].type == 7 && _flagsTable[_locationSoundsTable[i].flagNum] == _locationSoundsTable[i].flagValueStartFx)) {
-			startSound(_locationSoundsTable[i].offset, i, _locationSoundsTable[i].volume);
+		if (_locationSoundsTable[i]._type == 1 || _locationSoundsTable[i]._type == 2 || _locationSoundsTable[i]._type == 5 ||
+			(_locationSoundsTable[i]._type == 7 && _flagsTable[_locationSoundsTable[i]._flagNum] == _locationSoundsTable[i]._flagValueStartFx)) {
+			startSound(_locationSoundsTable[i]._offset, i, _locationSoundsTable[i]._volume);
 		}
 	}
 	for (int i = 0; i < _locationMusicsCount; ++i) {
-		if (_locationMusicsTable[i].flag > 0) {
-			startMusic(_locationMusicsTable[i].offset, i, _locationMusicsTable[i].volume);
+		if (_locationMusicsTable[i]._flag > 0) {
+			startMusic(_locationMusicsTable[i]._offset, i, _locationMusicsTable[i]._volume);
 		}
 	}
 }
@@ -1244,16 +1244,16 @@ void TuckerEngine::updateData3() {
 void TuckerEngine::updateSfxData3_1() {
 	for (int i = 0; i < _locationSoundsCount; ++i) {
 		LocationSound *s = &_locationSoundsTable[i];
-		if ((s->type == 6 || s->type == 7) && s->updateType == 1) {
+		if ((s->_type == 6 || s->_type == 7) && s->_updateType == 1) {
 			for (int j = 0; j < _spritesCount; ++j) {
-				if (_spritesTable[j]._animationFrame == s->startFxSpriteNum && _spritesTable[j]._state == s->startFxSpriteState) {
-					if (s->type == 7) {
-						_flagsTable[s->flagNum] = s->flagValueStartFx;
+				if (_spritesTable[j]._animationFrame == s->_startFxSpriteNum && _spritesTable[j]._state == s->_startFxSpriteState) {
+					if (s->_type == 7) {
+						_flagsTable[s->_flagNum] = s->_flagValueStartFx;
 					}
-					startSound(s->offset, i, s->volume);
-				} else if (s->type == 7) {
-					if (_spritesTable[j]._animationFrame == s->stopFxSpriteNum && _spritesTable[j]._state == s->stopFxSpriteState) {
-						_flagsTable[s->flagNum] = s->flagValueStopFx;
+					startSound(s->_offset, i, s->_volume);
+				} else if (s->_type == 7) {
+					if (_spritesTable[j]._animationFrame == s->_stopFxSpriteNum && _spritesTable[j]._state == s->_stopFxSpriteState) {
+						_flagsTable[s->_flagNum] = s->_flagValueStopFx;
 						stopSound(i);
 					}
 				}
@@ -1265,15 +1265,15 @@ void TuckerEngine::updateSfxData3_1() {
 void TuckerEngine::updateSfxData3_2() {
 	for (int i = 0; i < _locationSoundsCount; ++i) {
 		LocationSound *s = &_locationSoundsTable[i];
-		if ((s->type == 6 || s->type == 7) && s->updateType == 0) {
-			if (s->startFxSpriteNum == _backgroundSpriteCurrentFrame && s->startFxSpriteState == _backgroundSpriteCurrentAnimation) {
-				if (s->type == 7) {
-					_flagsTable[s->flagNum] = s->flagValueStartFx;
+		if ((s->_type == 6 || s->_type == 7) && s->_updateType == 0) {
+			if (s->_startFxSpriteNum == _backgroundSpriteCurrentFrame && s->_startFxSpriteState == _backgroundSpriteCurrentAnimation) {
+				if (s->_type == 7) {
+					_flagsTable[s->_flagNum] = s->_flagValueStartFx;
 				}
-				startSound(s->offset, i, s->volume);
-			} else if (s->type == 7) {
-				if (s->stopFxSpriteNum == _backgroundSpriteCurrentFrame && s->stopFxSpriteState == _backgroundSpriteCurrentAnimation) {
-					_flagsTable[s->flagNum] = s->flagValueStopFx;
+				startSound(s->_offset, i, s->_volume);
+			} else if (s->_type == 7) {
+				if (s->_stopFxSpriteNum == _backgroundSpriteCurrentFrame && s->_stopFxSpriteState == _backgroundSpriteCurrentAnimation) {
+					_flagsTable[s->_flagNum] = s->_flagValueStopFx;
 					stopSound(i);
 				}
 			}
@@ -1505,7 +1505,7 @@ void TuckerEngine::startCharacterSounds() {
 	if (_characterSoundFxDelayCounter != 0) {
 		--_characterSoundFxDelayCounter;
 		if (_characterSoundFxDelayCounter <= 0) {
-			startSound(_locationSoundsTable[_characterSoundFxNum].offset, _characterSoundFxNum, _locationSoundsTable[_characterSoundFxNum].volume);
+			startSound(_locationSoundsTable[_characterSoundFxNum]._offset, _characterSoundFxNum, _locationSoundsTable[_characterSoundFxNum]._volume);
 		}
 	}
 }
@@ -1515,16 +1515,16 @@ void TuckerEngine::updateSoundsTypes3_4() {
 		return;
 	}
 	for (int i = 0; i < _locationSoundsCount; ++i) {
-		switch (_locationSoundsTable[i].type) {
+		switch (_locationSoundsTable[i]._type) {
 		case 3:
 			if (getRandomNumber() >= 32300) {
-				startSound(_locationSoundsTable[i].offset, 0, _locationSoundsTable[i].volume);
+				startSound(_locationSoundsTable[i]._offset, 0, _locationSoundsTable[i]._volume);
 				return;
 			}
 			break;
 		case 4:
 			if (getRandomNumber() >= 32763) {
-				startSound(_locationSoundsTable[i].offset, 0, _locationSoundsTable[i].volume);
+				startSound(_locationSoundsTable[i]._offset, 0, _locationSoundsTable[i]._volume);
 				return;
 			}
 			break;
@@ -1792,8 +1792,8 @@ void TuckerEngine::setVolumeMusic(int index, int volume) {
 }
 
 void TuckerEngine::startSound(int offset, int index, int volume) {
-	bool loop = (_locationSoundsTable[index].type == 2 || _locationSoundsTable[index].type == 5 || _locationSoundsTable[index].type == 7);
-	loadSound(Audio::Mixer::kSFXSoundType, _locationSoundsTable[index].num, volume, loop, &_sfxHandles[index]);
+	bool loop = (_locationSoundsTable[index]._type == 2 || _locationSoundsTable[index]._type == 5 || _locationSoundsTable[index]._type == 7);
+	loadSound(Audio::Mixer::kSFXSoundType, _locationSoundsTable[index]._num, volume, loop, &_sfxHandles[index]);
 }
 
 void TuckerEngine::stopSound(int index) {
@@ -1805,8 +1805,8 @@ bool TuckerEngine::isSoundPlaying(int index) {
 }
 
 void TuckerEngine::startMusic(int offset, int index, int volume) {
-	bool loop = (_locationMusicsTable[index].flag == 2);
-	loadSound(Audio::Mixer::kMusicSoundType, _locationMusicsTable[index].num, volume, loop, &_musicHandles[index]);
+	bool loop = (_locationMusicsTable[index]._flag == 2);
+	loadSound(Audio::Mixer::kMusicSoundType, _locationMusicsTable[index]._num, volume, loop, &_musicHandles[index]);
 }
 
 void TuckerEngine::stopMusic(int index) {
@@ -3214,8 +3214,8 @@ int TuckerEngine::executeTableInstruction() {
 		return 0;
 	case kCode_flx:
 		i = readTableInstructionParam(2);
-		_locationSoundsTable[i].type = 2;
-		startSound(_locationSoundsTable[i].offset, i, _locationSoundsTable[i].volume);
+		_locationSoundsTable[i]._type = 2;
+		startSound(_locationSoundsTable[i]._offset, i, _locationSoundsTable[i]._volume);
 		return 0;
 	case kCode_fxx:
 		i = readTableInstructionParam(2);
@@ -3225,7 +3225,7 @@ int TuckerEngine::executeTableInstruction() {
 		return 0;
 	case kCode_fx:
 		i = readTableInstructionParam(2);
-		startSound(_locationSoundsTable[i].offset, i, _locationSoundsTable[i].volume);
+		startSound(_locationSoundsTable[i]._offset, i, _locationSoundsTable[i]._volume);
 		_soundInstructionIndex = i;
 		return 0;
 	case kCode_gfg:
@@ -3384,21 +3384,21 @@ int TuckerEngine::getObjectUnderCursor() {
 		return -1;
 	}
 	for (int i = 0; i < _locationObjectsCount; ++i) {
-		if (_mousePosX + _scrollOffset + 1 <= _locationObjectsTable[i].xPos) {
+		if (_mousePosX + _scrollOffset + 1 <= _locationObjectsTable[i]._xPos) {
 			continue;
 		}
-		if (_mousePosX + _scrollOffset >= _locationObjectsTable[i].xPos + _locationObjectsTable[i].xSize) {
+		if (_mousePosX + _scrollOffset >= _locationObjectsTable[i]._xPos + _locationObjectsTable[i]._xSize) {
 			continue;
 		}
-		if (_mousePosY <= _locationObjectsTable[i].yPos) {
+		if (_mousePosY <= _locationObjectsTable[i]._yPos) {
 			continue;
 		}
-		if (_mousePosY >= _locationObjectsTable[i].yPos + _locationObjectsTable[i].ySize) {
+		if (_mousePosY >= _locationObjectsTable[i]._yPos + _locationObjectsTable[i]._ySize) {
 			continue;
 		}
 		_selectedObjectType = 0;
 		_selectedCharacterNum = i;
-		setCursorNum(_locationObjectsTable[i].cursorNum);
+		setCursorNum(_locationObjectsTable[i]._cursorNum);
 		return i;
 	}
 	return -1;
@@ -3420,16 +3420,16 @@ void TuckerEngine::setSelectedObjectKey() {
 			_selectedObject.xPos = x;
 			_selectedObject.yPos = _mousePosY;
 		} else {
-			_selectedObject.xPos = _locationObjectsTable[_selectedCharacterNum].standX;
-			_selectedObject.yPos = _locationObjectsTable[_selectedCharacterNum].standY;
+			_selectedObject.xPos = _locationObjectsTable[_selectedCharacterNum]._standX;
+			_selectedObject.yPos = _locationObjectsTable[_selectedCharacterNum]._standY;
 			if (_actionVerb == 0 || _actionVerb == 8) {
-				_selectedObject.locationObject_locationNum = _locationObjectsTable[_selectedCharacterNum].locationNum;
-				_selectedObject.locationObject_toX = _locationObjectsTable[_selectedCharacterNum].toX;
-				_selectedObject.locationObject_toY = _locationObjectsTable[_selectedCharacterNum].toY;
-				_selectedObject.locationObject_toX2 = _locationObjectsTable[_selectedCharacterNum].toX2;
-				_selectedObject.locationObject_toY2 = _locationObjectsTable[_selectedCharacterNum].toY2;
-				_selectedObject.locationObject_toWalkX2 = _locationObjectsTable[_selectedCharacterNum].toWalkX2;
-				_selectedObject.locationObject_toWalkY2 = _locationObjectsTable[_selectedCharacterNum].toWalkY2;
+				_selectedObject.locationObject_locationNum = _locationObjectsTable[_selectedCharacterNum]._locationNum;
+				_selectedObject.locationObject_toX = _locationObjectsTable[_selectedCharacterNum]._toX;
+				_selectedObject.locationObject_toY = _locationObjectsTable[_selectedCharacterNum]._toY;
+				_selectedObject.locationObject_toX2 = _locationObjectsTable[_selectedCharacterNum]._toX2;
+				_selectedObject.locationObject_toY2 = _locationObjectsTable[_selectedCharacterNum]._toY2;
+				_selectedObject.locationObject_toWalkX2 = _locationObjectsTable[_selectedCharacterNum]._toWalkX2;
+				_selectedObject.locationObject_toWalkY2 = _locationObjectsTable[_selectedCharacterNum]._toWalkY2;
 			}
 		}
 	} else {
diff --git a/engines/tucker/tucker.h b/engines/tucker/tucker.h
index 639a4d9..ff3e301 100644
--- a/engines/tucker/tucker.h
+++ b/engines/tucker/tucker.h
@@ -143,43 +143,43 @@ struct LocationAnimation {
 };
 
 struct LocationObject {
-	int xPos;
-	int yPos;
-	int xSize;
-	int ySize;
-	int textNum;
-	int locationNum;
-	int toX;
-	int toY;
-	int toX2;
-	int toY2;
-	int toWalkX2;
-	int toWalkY2;
-	int standX;
-	int standY;
-	int cursorNum;
+	int _xPos;
+	int _yPos;
+	int _xSize;
+	int _ySize;
+	int _textNum;
+	int _locationNum;
+	int _toX;
+	int _toY;
+	int _toX2;
+	int _toY2;
+	int _toWalkX2;
+	int _toWalkY2;
+	int _standX;
+	int _standY;
+	int _cursorNum;
 };
 
 struct LocationSound {
-	int startFxSpriteState;
-	int startFxSpriteNum;
-	int updateType;
-	int stopFxSpriteState;
-	int stopFxSpriteNum;
-	int offset;
-	int type;
-	int volume;
-	int flagValueStartFx;
-	int flagValueStopFx;
-	int flagNum;
-	int num;
+	int _startFxSpriteState;
+	int _startFxSpriteNum;
+	int _updateType;
+	int _stopFxSpriteState;
+	int _stopFxSpriteNum;
+	int _offset;
+	int _type;
+	int _volume;
+	int _flagValueStartFx;
+	int _flagValueStopFx;
+	int _flagNum;
+	int _num;
 };
 
 struct LocationMusic {
-	int flag;
-	int offset;
-	int volume;
-	int num;
+	int _flag;
+	int _offset;
+	int _volume;
+	int _num;
 };
 
 enum {






More information about the Scummvm-git-logs mailing list