[Scummvm-cvs-logs] scummvm master -> f5bfe8eb1160a84199fb0ba1b3c4c8cb02008c5b
cyxx
cyx at scummvm.org
Sat Feb 19 17:18:08 CET 2011
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c53abb0aba TUCKER: fix truncated action string in english version
855b676cd4 TUCKER: cleanup, removed unused variables
f5bfe8eb11 QUEEN: fix #1858081 - Jetty: "sign" at wrong position
Commit: c53abb0abaf62ca3f2e510894148304da803fa73
https://github.com/scummvm/scummvm/commit/c53abb0abaf62ca3f2e510894148304da803fa73
Author: Gregory Montoir (cyx at scummvm.org)
Date: 2011-02-19T06:37:24-08:00
Commit Message:
TUCKER: fix truncated action string in english version
Changed paths:
engines/tucker/tucker.cpp
diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp
index 092bd74..4c7b46a 100644
--- a/engines/tucker/tucker.cpp
+++ b/engines/tucker/tucker.cpp
@@ -1973,12 +1973,10 @@ void TuckerEngine::drawInfoString() {
if (_actionRequiresTwoObjects) {
verbPreposition = (_actionVerb == 5) ? 12 : 11;
verbPrepositionWidth = getStringWidth(verbPreposition, infoStrBuf) + 4;
- if (_gameLang == Common::FR_FRA || _gameLang == Common::DE_DEU) {
- if ((_actionObj2Num > 0 || _actionObj2Type > 0) && verbPreposition > 0) {
- infoStringWidth = 0;
- verbWidth = 0;
- object1NameWidth = 0;
- }
+ if (_gameLang != Common::EN_ANY && (_actionObj2Num > 0 || _actionObj2Type > 0) && verbPreposition > 0) {
+ infoStringWidth = 0;
+ verbWidth = 0;
+ object1NameWidth = 0;
}
infoStringWidth += verbPrepositionWidth;
if (_actionObj2Num > 0 || _actionObj2Type > 0) {
@@ -1986,7 +1984,7 @@ void TuckerEngine::drawInfoString() {
}
}
const int xPos = 159 - infoStringWidth / 2;
- if (verbPreposition == 0 || (_actionObj2Num == 0 && _actionObj2Type == 0)) {
+ if (_gameLang == Common::EN_ANY || (_actionObj2Num == 0 && _actionObj2Type == 0) || verbPreposition == 0) {
drawItemString(xPos, _actionVerb + 1, infoStrBuf);
if (_actionObj1Num > 0 || _actionObj1Type > 0) {
drawItemString(xPos + 4 + verbWidth, _actionObj1Num + 1, obj1StrBuf);
Commit: 855b676cd408e4923c20e24ca467c813b1a944da
https://github.com/scummvm/scummvm/commit/855b676cd408e4923c20e24ca467c813b1a944da
Author: Gregory Montoir (cyx at scummvm.org)
Date: 2011-02-19T06:52:03-08:00
Commit Message:
TUCKER: cleanup, removed unused variables
Changed paths:
engines/tucker/resource.cpp
engines/tucker/sequences.cpp
engines/tucker/tucker.cpp
engines/tucker/tucker.h
diff --git a/engines/tucker/resource.cpp b/engines/tucker/resource.cpp
index d96b8a3..c0f1baa 100644
--- a/engines/tucker/resource.cpp
+++ b/engines/tucker/resource.cpp
@@ -383,12 +383,14 @@ void TuckerEngine::loadPanel() {
}
void TuckerEngine::loadBudSpr(int startOffset) {
- int endOffset = loadCTable01(0, startOffset);
+ int framesCount[20];
+ memset(framesCount, 0, sizeof(framesCount));
+ int endOffset = loadCTable01(0, startOffset, framesCount);
loadCTable02(0);
int frame = 0;
int spriteOffset = 0;
for (int i = startOffset; i < endOffset; ++i) {
- if (_ctable01Table_sprite[frame] == i) {
+ if (framesCount[frame] == i) {
char filename[40];
switch (_flagsTable[137]) {
case 0:
@@ -414,7 +416,7 @@ void TuckerEngine::loadBudSpr(int startOffset) {
}
}
-int TuckerEngine::loadCTable01(int index, int firstSpriteNum) {
+int TuckerEngine::loadCTable01(int index, int firstSpriteNum, int *framesCount) {
loadFile("ctable01.c", _loadTempBuf);
DataTokenizer t(_loadTempBuf, _fileLoadSize);
int lastSpriteNum = firstSpriteNum;
@@ -425,7 +427,7 @@ int TuckerEngine::loadCTable01(int index, int firstSpriteNum) {
if (x < 0) {
break;
} else if (x == 999) {
- _ctable01Table_sprite[count] = lastSpriteNum;
+ framesCount[count] = lastSpriteNum;
++count;
continue;
}
@@ -444,7 +446,7 @@ int TuckerEngine::loadCTable01(int index, int firstSpriteNum) {
}
}
}
- _ctable01Table_sprite[count] = -1;
+ framesCount[count] = -1;
return lastSpriteNum;
}
diff --git a/engines/tucker/sequences.cpp b/engines/tucker/sequences.cpp
index a655d5b..40706ae 100644
--- a/engines/tucker/sequences.cpp
+++ b/engines/tucker/sequences.cpp
@@ -110,7 +110,6 @@ void TuckerEngine::handleCreditsSequence() {
}
redrawScreen(0);
waitForTimer(3);
- _timerCounter1 = 0;
counter4 = _timerCounter2 / 3;
if (counter4 == _creditsSequenceTimecounts[num]) {
_fadePaletteCounter = 0;
diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp
index 4c7b46a..d4afdab 100644
--- a/engines/tucker/tucker.cpp
+++ b/engines/tucker/tucker.cpp
@@ -127,7 +127,7 @@ void TuckerEngine::restart() {
_syncCounter = 0;
_lastFrameTime = _system->getMillis();
_mainLoopCounter1 = _mainLoopCounter2 = 0;
- _timerCounter1 = _timerCounter2 = 0;
+ _timerCounter2 = 0;
_partNum = _currentPartNum = 0;
_locationNum = 0;
_nextLocationNum = ConfMan.getInt("boot_param");
@@ -273,7 +273,6 @@ void TuckerEngine::restart() {
_xPosCurrent = 160;
_characterSpeechDataPtr = 0;
_ptTextOffset = 0;
- memset(_ctable01Table_sprite, 0, sizeof(_ctable01Table_sprite));
memset(_characterAnimationsTable, 0, sizeof(_characterAnimationsTable));
memset(_characterStateTable, 0, sizeof(_characterStateTable));
_backgroundSprOffset = 0;
@@ -589,13 +588,11 @@ void TuckerEngine::mainLoop() {
void TuckerEngine::waitForTimer(int ticksCount) {
uint32 end = _lastFrameTime + ticksCount * 1000 / 46;
do {
- ++_timerCounter1;
parseEvents();
_system->delayMillis(10);
_lastFrameTime = _system->getMillis();
} while (!_fastMode && _lastFrameTime < end);
_timerCounter2 += ticksCount;
- _timerCounter1 = 0;
}
void TuckerEngine::parseEvents() {
diff --git a/engines/tucker/tucker.h b/engines/tucker/tucker.h
index 4d7b530..6488bbc 100644
--- a/engines/tucker/tucker.h
+++ b/engines/tucker/tucker.h
@@ -593,7 +593,7 @@ protected:
void loadCharSizeDta();
void loadPanel();
void loadBudSpr(int startOffset);
- int loadCTable01(int index, int firstSpriteNum);
+ int loadCTable01(int index, int firstSpriteNum, int *framesCount);
void loadCTable02(int fl);
void loadLoc();
void loadObj();
@@ -624,7 +624,6 @@ protected:
uint32 _lastFrameTime;
int _mainLoopCounter1;
int _mainLoopCounter2;
- int _timerCounter1;
int _timerCounter2;
int _flagsTable[kFlagsTableSize];
int _partNum;
@@ -803,7 +802,6 @@ protected:
int _yPosCurrent;
const uint8 *_characterSpeechDataPtr;
int _ptTextOffset;
- int _ctable01Table_sprite[20];
int _characterAnimationsTable[200];
int _characterStateTable[200];
int _backgroundSprOffset;
Commit: f5bfe8eb1160a84199fb0ba1b3c4c8cb02008c5b
https://github.com/scummvm/scummvm/commit/f5bfe8eb1160a84199fb0ba1b3c4c8cb02008c5b
Author: Gregory Montoir (cyx at scummvm.org)
Date: 2011-02-19T08:17:15-08:00
Commit Message:
QUEEN: fix #1858081 - Jetty: "sign" at wrong position
Off by one error in original object trigger ; since this is
minor glitch, this patch only fixes new game state (ie. existing
savegames are still affected).
Changed paths:
engines/queen/command.cpp
diff --git a/engines/queen/command.cpp b/engines/queen/command.cpp
index 543cd15..356856e 100644
--- a/engines/queen/command.cpp
+++ b/engines/queen/command.cpp
@@ -367,6 +367,17 @@ void Command::readCommandsFrom(byte *&ptr) {
memset(&_cmdObject[0], 0, sizeof(CmdObject));
for (i = 1; i <= _numCmdObject; i++) {
_cmdObject[i].readFromBE(ptr);
+
+ // WORKAROUND bug #1858081: Fix an off by one error in the object
+ // command 175. Object 309 should be copied to 308 (disabled).
+ //
+ // _objectData[307].name = -195
+ // _objectData[308].name = 50
+ // _objectData[309].name = -50
+
+ if (i == 175 && _cmdObject[i].id == 320 && _cmdObject[i].dstObj == 307 && _cmdObject[i].srcObj == 309) {
+ _cmdObject[i].dstObj = 308;
+ }
}
}
More information about the Scummvm-git-logs
mailing list