thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCUMM: Fix bug in V12 games causing chars to be lost when wrapping talk text

Browse source 
svn-id: r54729
This commit is contained in:
Max Horn 2010-12-02 00:27:26 +00:00
parent b36b7ee349
commit e85d196f33
2 changed files with 31 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

1
engines/scumm/scumm.h
View file

@ -1246,6 +1246,7 @@ protected:
virtual bool handleNextCharsetCode(Actor *a, int *c); virtual bool handleNextCharsetCode(Actor *a, int *c);
virtual void CHARSET_1(); virtual void CHARSET_1();
bool newLine();
void drawString(int a, const byte *msg); void drawString(int a, const byte *msg);
void debugMessage(const byte *msg); void debugMessage(const byte *msg);
void showMessageDialog(const byte *msg); void showMessageDialog(const byte *msg);

54
engines/scumm/string.cpp
View file

@ -426,6 +426,33 @@ bool ScummEngine_v72he::handleNextCharsetCode(Actor *a, int *code) {
} }
#endif #endif
bool ScummEngine::newLine() {
_nextLeft = _string[0].xpos;
if (_charset->_center) {
_nextLeft -= _charset->getStringWidth(0, _charsetBuffer + _charsetBufPos) / 2;
if (_nextLeft < 0)
_nextLeft = _game.version >= 6 ? _string[0].xpos : 0;
}
if (_game.version == 0) {
return false;
} else if (!(_game.platform == Common::kPlatformFMTowns) && _string[0].height) {
_nextTop += _string[0].height;
} else {
bool useCJK = _useCJKMode;
// SCUMM5 FM-Towns doesn't use the height of the ROM font here.
if (_game.platform == Common::kPlatformFMTowns && _game.version == 5)
_useCJKMode = false;
_nextTop += _charset->getFontHeight();
_useCJKMode = useCJK;
}
if (_game.version > 3) {
// FIXME: is this really needed?
_charset->_disableOffsX = true;
}
return true;
}
void ScummEngine::CHARSET_1() { void ScummEngine::CHARSET_1() {
Actor *a; Actor *a;
#ifdef ENABLE_SCUMM_7_8 #ifdef ENABLE_SCUMM_7_8
@ -579,36 +606,14 @@ void ScummEngine::CHARSET_1() {
} }
if (c == 13) { if (c == 13) {
newLine:;
_nextLeft = _string[0].xpos;
#ifdef ENABLE_SCUMM_7_8 #ifdef ENABLE_SCUMM_7_8
if (_game.version >= 7 && subtitleLine != subtitleBuffer) { if (_game.version >= 7 && subtitleLine != subtitleBuffer) {
((ScummEngine_v7 *)this)->addSubtitleToQueue(subtitleBuffer, subtitlePos, _charsetColor, _charset->getCurID()); ((ScummEngine_v7 *)this)->addSubtitleToQueue(subtitleBuffer, subtitlePos, _charsetColor, _charset->getCurID());
subtitleLine = subtitleBuffer; subtitleLine = subtitleBuffer;
} }
#endif #endif
if (_charset->_center) { if (!newLine())
_nextLeft -= _charset->getStringWidth(0, _charsetBuffer + _charsetBufPos) / 2;
if (_nextLeft < 0)
_nextLeft = _game.version >= 6 ? _string[0].xpos : 0;
}
if (_game.version == 0) {
break; break;
} else if (!(_game.platform == Common::kPlatformFMTowns) && _string[0].height) {
_nextTop += _string[0].height;
} else {
bool useCJK = _useCJKMode;
// SCUMM5 FM-Towns doesn't use the height of the ROM font here.
if (_game.platform == Common::kPlatformFMTowns && _game.version == 5)
_useCJKMode = false;
_nextTop += _charset->getFontHeight();
_useCJKMode = useCJK;
}
if (_game.version > 3) {
// FIXME: is this really needed?
_charset->_disableOffsX = true;
}
continue; continue;
} }
@ -618,7 +623,8 @@ void ScummEngine::CHARSET_1() {
} }
// Handle line breaks for V1-V2 // Handle line breaks for V1-V2
if (_game.version <= 2 && _nextLeft >= _screenWidth) { if (_game.version <= 2 && _nextLeft >= _screenWidth) {
goto newLine; if (!newLine())
break; // FIXME: Is this necessary? Only would be relevant for v0 games
} }
_charset->_left = _nextLeft; _charset->_left = _nextLeft;