[Scummvm-cvs-logs] scummvm master -> 8a5078966290a3fbc0ee78d662cafa66a910b029

cyxx gregory.montoir at laposte.net
Fri Feb 18 15:21:45 CET 2011


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

Summary:
da77a057d1 TUCKER: fix #2627967 - Slow Walking
d9140ab626 TUCKER: fix #2628056 - Text Dialogue is out of sync
a0d74d0459 TUCKER: fix #3106520 - Prison water drop leaves a line
3557ff5747 TUCKER: fix #3106536 - Punk stuck (moving in background)
e552b5a8c3 TUCKER: fix #3106542 - Ego drawn behind background
0bffd77dfe TUCKER: fix #3106766 - Bubbles in Plugs Shop too heavy
34f428ea91 TUCKER: cleanup
8a50789662 TOUCHE: fix op_not/op_neg opcodes naming


Commit: da77a057d17c3985632e704b5cff88ef6729beed
    https://github.com/scummvm/scummvm/commit/da77a057d17c3985632e704b5cff88ef6729beed
Author: Gregory Montoir (cyx at scummvm.org)
Date: 2011-02-18T06:18:44-08:00

Commit Message:
TUCKER: fix #2627967 - Slow Walking

The waitForTimer calls in fade*Palette are actually
duplicated ; mainLoop already handles timing.

Changed paths:
    engines/tucker/tucker.cpp



diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp
index c61a422..6e766aa 100644
--- a/engines/tucker/tucker.cpp
+++ b/engines/tucker/tucker.cpp
@@ -952,7 +952,6 @@ void TuckerEngine::fadeOutPalette(int colorsCount) {
 	}
 	_system->getPaletteManager()->setPalette(pal, 0, colorsCount);
 	_system->updateScreen();
-	waitForTimer(1);
 }
 
 void TuckerEngine::fadeInPalette(int colorsCount) {
@@ -966,7 +965,6 @@ void TuckerEngine::fadeInPalette(int colorsCount) {
 	}
 	_system->getPaletteManager()->setPalette(pal, 0, colorsCount);
 	_system->updateScreen();
-	waitForTimer(1);
 }
 
 void TuckerEngine::fadePaletteColor(int color, int step) {


Commit: d9140ab62683c624a8f2fc294df027cc94c01c84
    https://github.com/scummvm/scummvm/commit/d9140ab62683c624a8f2fc294df027cc94c01c84
Author: Gregory Montoir (cyx at scummvm.org)
Date: 2011-02-18T06:18:44-08:00

Commit Message:
TUCKER: fix #2628056 - Text Dialogue is out of sync

always synchronize text with speech sound. Note, some
subtitles present in the datafiles are inconsistent
(written text different from spoken).

Changed paths:
    engines/tucker/tucker.cpp



diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp
index 6e766aa..ad10b5b 100644
--- a/engines/tucker/tucker.cpp
+++ b/engines/tucker/tucker.cpp
@@ -556,13 +556,7 @@ void TuckerEngine::mainLoop() {
 		if (_inputKeys[kInputKeyToggleTextSpeech]) {
 			_inputKeys[kInputKeyToggleTextSpeech] = false;
 			if ((_gameFlags & kGameFlagNoSubtitles) == 0) {
-				if (_displaySpeechText) {
-					_displaySpeechText = false;
-//					kDefaultCharSpeechSoundCounter = 1;
-				} else {
-					_displaySpeechText = true;
-//					kDefaultCharSpeechSoundCounter = 70;
-				}
+				_displaySpeechText = !_displaySpeechText;
 				ConfMan.setBool("subtitles", _displaySpeechText);
 			}
 		}
@@ -2889,7 +2883,11 @@ void TuckerEngine::updateCharSpeechSound(bool displayText) {
 	if (_charSpeechSoundCounter == 0) {
 		return;
 	}
-	--_charSpeechSoundCounter;
+	if (_displaySpeechText) {
+		_charSpeechSoundCounter = 0;
+	} else {
+		--_charSpeechSoundCounter;
+	}
 	if (_charSpeechSoundCounter == 0) {
 		_charSpeechSoundCounter = isSpeechSoundPlaying() ? 1 : 0;
 		if (_charSpeechSoundCounter == 0) {


Commit: a0d74d0459a05bcbd3f1973eb2c072553c12d13d
    https://github.com/scummvm/scummvm/commit/a0d74d0459a05bcbd3f1973eb2c072553c12d13d
Author: Gregory Montoir (cyx at scummvm.org)
Date: 2011-02-18T06:18:44-08:00

Commit Message:
TUCKER: fix #3106520 - Prison water drop leaves a line

Changed paths:
    engines/tucker/locations.cpp



diff --git a/engines/tucker/locations.cpp b/engines/tucker/locations.cpp
index 009695e..ed52804 100644
--- a/engines/tucker/locations.cpp
+++ b/engines/tucker/locations.cpp
@@ -660,7 +660,7 @@ void TuckerEngine::execData3PostUpdate_locationNum8() {
 				_locationBackgroundGfxBuf[offset + 640 * j + i] = colorsTable[(j - 1) * 3  + i + 1];
 			}
 		}
-		addDirtyRect(_updateLocationXPosTable2[0] - 1, _updateLocationYPosTable2[0] + 1, 3, 4);
+		addDirtyRect(_updateLocationXPosTable2[0] - 1, _updateLocationYPosTable2[0], 3, 4);
 		_updateLocationYPosTable2[0] += 2;
 		if (_updateLocationYPosTable2[0] > 120) {
 			_updateLocationYPosTable2[0] = 0;


Commit: 3557ff5747cbbc8578f2b7ef934b3344d252e4a0
    https://github.com/scummvm/scummvm/commit/3557ff5747cbbc8578f2b7ef934b3344d252e4a0
Author: Gregory Montoir (cyx at scummvm.org)
Date: 2011-02-18T06:18:44-08:00

Commit Message:
TUCKER: fix #3106536 - Punk stuck (moving in background)

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



diff --git a/engines/tucker/locations.cpp b/engines/tucker/locations.cpp
index ed52804..d99208e 100644
--- a/engines/tucker/locations.cpp
+++ b/engines/tucker/locations.cpp
@@ -676,7 +676,7 @@ void TuckerEngine::execData3PostUpdate_locationNum8() {
 
 void TuckerEngine::updateSprite_locationNum9_0(int i) {
 	if (_charSpeechSoundCounter > 0 && _actionCharacterNum == 0) {
-		_spritesTable[0].needUpdate = 1;
+		_spritesTable[i].needUpdate = 1;
 		_spritesTable[i].state = 3;
 	} else if (_updateLocationCounter2 > 0 || getRandomNumber() > 30000) {
 		_spritesTable[i].state = 1;
diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp
index ad10b5b..754ec21 100644
--- a/engines/tucker/tucker.cpp
+++ b/engines/tucker/tucker.cpp
@@ -1921,7 +1921,9 @@ void TuckerEngine::drawSprite(int num) {
 			Graphics::decodeRLE_248(dstPtr, srcPtr, srcW, srcH, 0, s->yMaxBackground, s->flipX != 0);
 			break;
 		}
-		addDirtyRect(xPos, srcY, srcW, srcH);
+		const int xR = srcX + (s->gfxBackgroundOffset % 640);
+		const int yR = srcY + (s->gfxBackgroundOffset / 640);
+		addDirtyRect(xR, yR, srcW, srcH);
 	}
 }
 


Commit: e552b5a8c3b36871b40be49855553865d2471a66
    https://github.com/scummvm/scummvm/commit/e552b5a8c3b36871b40be49855553865d2471a66
Author: Gregory Montoir (cyx at scummvm.org)
Date: 2011-02-18T06:18:44-08:00

Commit Message:
TUCKER: fix #3106542 - Ego drawn behind background

Looks like an original game glitch, the location 14
background bitmap contains some pixels in range
[0xE0-0xF8] which is usually reserved ; add workaround.

Changed paths:
    engines/tucker/graphics.cpp
    engines/tucker/graphics.h
    engines/tucker/tucker.cpp



diff --git a/engines/tucker/graphics.cpp b/engines/tucker/graphics.cpp
index 52018d2..1637191 100644
--- a/engines/tucker/graphics.cpp
+++ b/engines/tucker/graphics.cpp
@@ -112,7 +112,7 @@ void Graphics::decodeRLE_224(uint8 *dst, const uint8 *src, int w, int h) {
 	}
 }
 
-void Graphics::decodeRLE_248(uint8 *dst, const uint8 *src, int w, int h, int y1, int y2, bool xflip) {
+void Graphics::decodeRLE_248(uint8 *dst, const uint8 *src, int w, int h, int y1, int y2, bool xflip, bool color248Only) {
 	int code = 0;
 	int color = 0;
 	for (int y = 0; y < h; ++y) {
@@ -125,7 +125,7 @@ void Graphics::decodeRLE_248(uint8 *dst, const uint8 *src, int w, int h, int y1,
 				}
 			}
 			if (color != 0) {
-				if ((dst[offset] < 0xE0 || y + y1 < y2) && dst[offset] < 0xF8) {
+				if ((color248Only || dst[offset] < 0xE0 || y + y1 < y2) && dst[offset] < 0xF8) {
 					dst[offset] = color;
 				}
 			} else {
diff --git a/engines/tucker/graphics.h b/engines/tucker/graphics.h
index 60c66f5..c5b723e 100644
--- a/engines/tucker/graphics.h
+++ b/engines/tucker/graphics.h
@@ -52,7 +52,7 @@ public:
 
 	static void decodeRLE(uint8 *dst, const uint8 *src, int w, int h);
 	static void decodeRLE_224(uint8 *dst, const uint8 *src, int w, int h);
-	static void decodeRLE_248(uint8 *dst, const uint8 *src, int w, int h, int y1, int y2, bool xflip);
+	static void decodeRLE_248(uint8 *dst, const uint8 *src, int w, int h, int y1, int y2, bool xflip, bool color248Only = false);
 	static void decodeRLE_320(uint8 *dst, const uint8 *src, int w, int h);
 
 	static void copyRect(uint8 *dst, int dstPitch, uint8 *src, int srcPitch, int w, int h);
diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp
index 754ec21..553a860 100644
--- a/engines/tucker/tucker.cpp
+++ b/engines/tucker/tucker.cpp
@@ -1749,6 +1749,8 @@ void TuckerEngine::drawCurrentSprite() {
 	if ((_locationNum == 17 || _locationNum == 18) && _currentSpriteAnimationFrame == 16) {
 		return;
 	}
+	// Workaround original game glitch: location 14 contains some colors from [0xE0-0xF8] in a walkable area (tracker item #3106542)
+	const bool color248Only = (_locationNum == 14);
 	SpriteFrame *chr = &_spriteFramesTable[_currentSpriteAnimationFrame];
 	int yPos = _yPosCurrent + _mainSpritesBaseOffset - 54 + chr->yOffset;
 	int xPos = _xPosCurrent;
@@ -1758,7 +1760,7 @@ void TuckerEngine::drawCurrentSprite() {
 		xPos -= chr->xSize + chr->xOffset - 14;
 	}
 	Graphics::decodeRLE_248(_locationBackgroundGfxBuf + yPos * 640 + xPos, _spritesGfxBuf + chr->sourceOffset, chr->xSize, chr->ySize,
-		chr->yOffset, _locationHeightTable[_locationNum], _mirroredDrawing != 0);
+		chr->yOffset, _locationHeightTable[_locationNum], _mirroredDrawing != 0, color248Only);
 	addDirtyRect(xPos, yPos, chr->xSize, chr->ySize);
 	if (_currentSpriteAnimationLength > 1) {
 		SpriteFrame *chr2 = &_spriteFramesTable[_currentSpriteAnimationFrame2];
@@ -1770,7 +1772,7 @@ void TuckerEngine::drawCurrentSprite() {
 			xPos -= chr2->xSize + chr2->xOffset - 14;
 		}
 		Graphics::decodeRLE_248(_locationBackgroundGfxBuf + yPos * 640 + xPos, _spritesGfxBuf + chr2->sourceOffset, chr2->xSize, chr2->ySize,
-			chr2->yOffset, _locationHeightTable[_locationNum], _mirroredDrawing != 0);
+			chr2->yOffset, _locationHeightTable[_locationNum], _mirroredDrawing != 0, color248Only);
 		addDirtyRect(xPos, yPos, chr2->xSize, chr2->ySize);
 	}
 }


Commit: 0bffd77dfefc33d5c6490383751f366f1b7ee0ed
    https://github.com/scummvm/scummvm/commit/0bffd77dfefc33d5c6490383751f366f1b7ee0ed
Author: Gregory Montoir (cyx at scummvm.org)
Date: 2011-02-18T06:20:31-08:00

Commit Message:
TUCKER: fix #3106766 - Bubbles in Plugs Shop too heavy

Changed paths:
    engines/tucker/locations.cpp



diff --git a/engines/tucker/locations.cpp b/engines/tucker/locations.cpp
index d99208e..416f2ba 100644
--- a/engines/tucker/locations.cpp
+++ b/engines/tucker/locations.cpp
@@ -974,7 +974,7 @@ void TuckerEngine::updateSprite_locationNum14(int i) {
 }
 
 void TuckerEngine::execData3PreUpdate_locationNum14() {
-	if (_yPosCurrent >= 126)
+	if (_yPosCurrent >= 127)
 		return;
 
 	if (!isSoundPlaying(0)) {
@@ -1021,7 +1021,7 @@ void TuckerEngine::execData3PreUpdate_locationNum14() {
 }
 
 void TuckerEngine::execData3PreUpdate_locationNum14Helper1(int i) {
-	const int y = 1872; // FIXME: bug, 187/182 ?
+	const int y = 117 * 16;
 	if (_updateLocation14ObjNum[i] == 0) {
 		if (getRandomNumber() <= 30000) {
 			return;
@@ -1031,9 +1031,8 @@ void TuckerEngine::execData3PreUpdate_locationNum14Helper1(int i) {
 		_updateLocation14Step[i] = -55 - getRandomNumber() / 512;
 		_updateLocation14ObjNum[i] = 231;
 		_updateLocation14Delay[i] = 16 + getRandomNumber() / 2048;
-		// FIXME: bug, missing return ?
 	}
-	_updateLocation14Step[i] = 4;
+	_updateLocation14Step[i] += 4;
 	_updateLocationYPosTable2[i] += _updateLocation14Step[i];
 	if (_updateLocationYPosTable2[i] > y) {
 		_updateLocationYPosTable2[i] = y;


Commit: 34f428ea9123840f1a4d45f0f3a9cc9fcd9d1b9e
    https://github.com/scummvm/scummvm/commit/34f428ea9123840f1a4d45f0f3a9cc9fcd9d1b9e
Author: Gregory Montoir (cyx at scummvm.org)
Date: 2011-02-18T06:20:31-08:00

Commit Message:
TUCKER: cleanup

Changed paths:
    engines/tucker/resource.cpp
    engines/tucker/sequences.cpp
    engines/tucker/tucker.cpp



diff --git a/engines/tucker/resource.cpp b/engines/tucker/resource.cpp
index 6b6ab1e..d96b8a3 100644
--- a/engines/tucker/resource.cpp
+++ b/engines/tucker/resource.cpp
@@ -393,16 +393,16 @@ void TuckerEngine::loadBudSpr(int startOffset) {
 			switch (_flagsTable[137]) {
 			case 0:
 				if ((_gameFlags & kGameFlagDemo) != 0) {
-					sprintf(filename, "budl00_%d.pcx", frame + 1);
+					snprintf(filename, sizeof(filename), "budl00_%d.pcx", frame + 1);
 				} else {
-					sprintf(filename, "bud_%d.pcx", frame + 1);
+					snprintf(filename, sizeof(filename), "bud_%d.pcx", frame + 1);
 				}
 				break;
 			case 1:
-				sprintf(filename, "peg_%d.pcx", frame + 1);
+				snprintf(filename, sizeof(filename), "peg_%d.pcx", frame + 1);
 				break;
 			default:
-				sprintf(filename, "mac_%d.pcx", frame + 1);
+				snprintf(filename, sizeof(filename), "mac_%d.pcx", frame + 1);
 				break;
 			}
 			loadImage(filename, _loadTempBuf, 0);
@@ -483,25 +483,25 @@ void TuckerEngine::loadLoc() {
 
 	int i = _locationWidthTable[_locationNum];
 	_locationHeight = (_locationNum < 73) ? 140 : 200;
-	sprintf(filename, (i == 1) ? "loc%02d.pcx" : "loc%02da.pcx", _locationNum);
+	snprintf(filename, sizeof(filename), (i == 1) ? "loc%02d.pcx" : "loc%02da.pcx", _locationNum);
 	copyLocBitmap(filename, 0, false);
 	Graphics::copyRect(_quadBackgroundGfxBuf, 320, _locationBackgroundGfxBuf, 640, 320, _locationHeight);
 	if (_locationHeight == 200) {
 		return;
 	}
-	sprintf(filename, (i != 2) ? "path%02d.pcx" : "path%02da.pcx", _locationNum);
+	snprintf(filename, sizeof(filename), (i != 2) ? "path%02d.pcx" : "path%02da.pcx", _locationNum);
 	copyLocBitmap(filename, 0, true);
 	if (i > 1) {
-		sprintf(filename, "loc%02db.pcx", _locationNum);
+		snprintf(filename, sizeof(filename), "loc%02db.pcx", _locationNum);
 		copyLocBitmap(filename, 320, false);
 		Graphics::copyRect(_quadBackgroundGfxBuf + 44800, 320, _locationBackgroundGfxBuf + 320, 640, 320, _locationHeight);
 		if (i == 2) {
-			sprintf(filename, "path%02db.pcx", _locationNum);
+			snprintf(filename, sizeof(filename), "path%02db.pcx", _locationNum);
 			copyLocBitmap(filename, 320, true);
 		}
 	}
 	if (i > 2) {
-		sprintf(filename, "loc%02dc.pcx", _locationNum);
+		snprintf(filename, sizeof(filename), "loc%02dc.pcx", _locationNum);
 		copyLocBitmap(filename, 0, false);
 		Graphics::copyRect(_quadBackgroundGfxBuf + 89600, 320, _locationBackgroundGfxBuf, 640, 320, 140);
 	}
@@ -510,7 +510,7 @@ void TuckerEngine::loadLoc() {
 		loadImage("rochpath.pcx", _loadLocBufPtr, 0);
 	}
 	if (i > 3) {
-		sprintf(filename, "loc%02dd.pcx", _locationNum);
+		snprintf(filename, sizeof(filename), "loc%02dd.pcx", _locationNum);
 		copyLocBitmap(filename, 0, false);
 		Graphics::copyRect(_quadBackgroundGfxBuf + 134400, 320, _locationBackgroundGfxBuf + 320, 640, 320, 140);
 	}
@@ -541,10 +541,10 @@ void TuckerEngine::loadObj() {
 	_currentPartNum = _partNum;
 
 	char filename[40];
-	sprintf(filename, "objtxt%d.c", _partNum);
+	snprintf(filename, sizeof(filename), "objtxt%d.c", _partNum);
 	free(_objTxtBuf);
 	_objTxtBuf = loadFile(filename, 0);
-	sprintf(filename, "pt%dtext.c", _partNum);
+	snprintf(filename, sizeof(filename), "pt%dtext.c", _partNum);
 	free(_ptTextBuf);
 	_ptTextBuf = loadFile(filename, 0);
 	_characterSpeechDataPtr = _ptTextBuf;
@@ -585,7 +585,7 @@ void TuckerEngine::loadData() {
 	int offset = 0;
 	for (int i = 0; i < count; ++i) {
 		char filename[40];
-		sprintf(filename, "scrobj%d%d.pcx", _partNum, i);
+		snprintf(filename, sizeof(filename), "scrobj%d%d.pcx", _partNum, i);
 		loadImage(filename, _loadTempBuf, 0);
 		offset = loadDataHelper(offset, i);
 	}
@@ -604,7 +604,7 @@ int TuckerEngine::loadDataHelper(int offset, int index) {
 
 void TuckerEngine::loadPanObj() {
 	char filename[40];
-	sprintf(filename, "panobjs%d.pcx", _partNum);
+	snprintf(filename, sizeof(filename), "panobjs%d.pcx", _partNum);
 	loadImage(filename, _loadTempBuf, 0);
 	int offset = 0;
 	for (int y = 0; y < 5; ++y) {
@@ -813,7 +813,7 @@ void TuckerEngine::loadSprA02_01() {
 	const int count = _sprA02LookupTable[_locationNum];
 	for (int i = 1; i < count + 1; ++i) {
 		char filename[40];
-		sprintf(filename, "sprites/a%02d_%02d.spr", _locationNum, i);
+		snprintf(filename, sizeof(filename), "sprites/a%02d_%02d.spr", _locationNum, i);
 		_sprA02Table[i] = loadFile(filename, 0);
 	}
 	_sprA02Table[0] = _sprA02Table[1];
@@ -832,7 +832,7 @@ void TuckerEngine::loadSprC02_01() {
 	const int count = _sprC02LookupTable[_locationNum];
 	for (int i = 1; i < count + 1; ++i) {
 		char filename[40];
-		sprintf(filename, "sprites/c%02d_%02d.spr", _locationNum, i);
+		snprintf(filename, sizeof(filename), "sprites/c%02d_%02d.spr", _locationNum, i);
 		_sprC02Table[i] = loadFile(filename, 0);
 	}
 	_sprC02Table[0] = _sprC02Table[1];
diff --git a/engines/tucker/sequences.cpp b/engines/tucker/sequences.cpp
index 73018b8..a655d5b 100644
--- a/engines/tucker/sequences.cpp
+++ b/engines/tucker/sequences.cpp
@@ -119,7 +119,7 @@ void TuckerEngine::handleCreditsSequence() {
 			char filename[40];
 			if (num == 6) {
 				for (int i = 0; i < 16; ++i) {
-					sprintf(filename, "cogs%04d.pcx", i + 1);
+					snprintf(filename, sizeof(filename), "cogs%04d.pcx", i + 1);
 					loadImage(filename, imgBuf + i * 64000, 2);
 				}
 			} else {
diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp
index 553a860..766172c 100644
--- a/engines/tucker/tucker.cpp
+++ b/engines/tucker/tucker.cpp
@@ -668,8 +668,8 @@ void TuckerEngine::updateCursorPos(int x, int y) {
 
 void TuckerEngine::setCursorNum(int num) {
 	_cursorNum = num;
-	const int cursorW = 16;
-	const int cursorH = 16;
+	static const int cursorW = 16;
+	static const int cursorH = 16;
 	CursorMan.replaceCursor(_cursorGfxBuf + _cursorNum * 256, cursorW, cursorH, 1, 1, 0);
 }
 
@@ -1090,17 +1090,15 @@ void TuckerEngine::stopSounds() {
 }
 
 void TuckerEngine::playSounds() {
-	for (int i = 0; i < 29; ++i) {
-		if (i < _locationSoundsCount) {
-			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 < _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 (i < _locationMusicsCount) {
-			if (_locationMusicsTable[i].flag > 0) {
-				startMusic(_locationMusicsTable[i].offset, i, _locationMusicsTable[i].volume);
-			}
+	}
+	for (int i = 0; i < _locationMusicsCount; ++i) {
+		if (_locationMusicsTable[i].flag > 0) {
+			startMusic(_locationMusicsTable[i].offset, i, _locationMusicsTable[i].volume);
 		}
 	}
 }
@@ -1422,7 +1420,6 @@ void TuckerEngine::redrawPanelOverBackground() {
 }
 
 void TuckerEngine::drawConversationTexts() {
-	int x = 0;
 	int y = 141;
 	int flag = 0;
 	for (int i = 0; i <  _conversationOptionsCount; ++i) {
@@ -1430,7 +1427,7 @@ void TuckerEngine::drawConversationTexts() {
 		if ((_mousePosY > y && _mousePosY < y + 11) || _nextTableToLoadIndex == i) {
 			color = 106;
 		}
-		drawSpeechText(x, y, _characterSpeechDataPtr, _instructionsActionsTable[i], color);
+		drawSpeechText(0, y, _characterSpeechDataPtr, _instructionsActionsTable[i], color);
 		if (_mousePosY > y && _mousePosY < _conversationOptionLinesCount * 10 + y + 1) {
 			_nextTableToLoadIndex = i;
 			flag = 1;


Commit: 8a5078966290a3fbc0ee78d662cafa66a910b029
    https://github.com/scummvm/scummvm/commit/8a5078966290a3fbc0ee78d662cafa66a910b029
Author: Gregory Montoir (cyx at scummvm.org)
Date: 2011-02-18T06:20:31-08:00

Commit Message:
TOUCHE: fix op_not/op_neg opcodes naming

Changed paths:
    engines/touche/opcodes.cpp
    engines/touche/touche.h



diff --git a/engines/touche/opcodes.cpp b/engines/touche/opcodes.cpp
index b2b16eb..5df0ca3 100644
--- a/engines/touche/opcodes.cpp
+++ b/engines/touche/opcodes.cpp
@@ -41,7 +41,7 @@ void ToucheEngine::setupOpcodes() {
 		&ToucheEngine::op_true,
 		&ToucheEngine::op_false,
 		&ToucheEngine::op_push,
-		&ToucheEngine::op_testFalse,
+		&ToucheEngine::op_not,
 		/* 0x08 */
 		&ToucheEngine::op_add,
 		&ToucheEngine::op_sub,
@@ -51,7 +51,7 @@ void ToucheEngine::setupOpcodes() {
 		&ToucheEngine::op_mod,
 		&ToucheEngine::op_and,
 		&ToucheEngine::op_or,
-		&ToucheEngine::op_not,
+		&ToucheEngine::op_neg,
 		/* 0x10 */
 		&ToucheEngine::op_testGreater,
 		&ToucheEngine::op_testEquals,
@@ -250,8 +250,8 @@ void ToucheEngine::op_push() {
 	*_script.stackDataPtr = 0;
 }
 
-void ToucheEngine::op_testFalse() {
-	debugC(9, kDebugOpcodes, "ToucheEngine::op_testFalse()");
+void ToucheEngine::op_not() {
+	debugC(9, kDebugOpcodes, "ToucheEngine::op_not()");
 	if (*_script.stackDataPtr == 0) {
 		*_script.stackDataPtr = -1;
 	} else {
@@ -309,8 +309,8 @@ void ToucheEngine::op_or() {
 	*_script.stackDataPtr |= val;
 }
 
-void ToucheEngine::op_not() {
-	debugC(9, kDebugOpcodes, "ToucheEngine::op_not()");
+void ToucheEngine::op_neg() {
+	debugC(9, kDebugOpcodes, "ToucheEngine::op_neg()");
 	uint16 val = *_script.stackDataPtr;
 	*_script.stackDataPtr = ~val;
 }
diff --git a/engines/touche/touche.h b/engines/touche/touche.h
index 50a5c6e..8b5f14d 100644
--- a/engines/touche/touche.h
+++ b/engines/touche/touche.h
@@ -531,7 +531,7 @@ protected:
 	void op_true();
 	void op_false();
 	void op_push();
-	void op_testFalse();
+	void op_not();
 	void op_add();
 	void op_sub();
 	void op_mul();
@@ -539,7 +539,7 @@ protected:
 	void op_mod();
 	void op_and();
 	void op_or();
-	void op_not();
+	void op_neg();
 	void op_testGreater();
 	void op_testEquals();
 	void op_testLower();






More information about the Scummvm-git-logs mailing list