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

SCUMM: (SCUMM7/8) - reorganize font rendering - second part

Browse source 
- Attach actor talk texts to the appropriate text renderer and get rid of redundant code.
- Cleanup subtitle text handling.
- Fix handling of ^codes.
- Fix more regressions from last commit.
- Correct some x/y positioning.
This commit is contained in:
athrxx 2021-08-28 17:38:38 +02:00
parent 1f56132725
commit 0256e92c25
10 changed files with 164 additions and 448 deletions
Download patch file Download diff file Expand all files Collapse all files

8
engines/scumm/string.cpp
View file

@ -677,12 +677,12 @@ void ScummEngine::CHARSET_1() {
}
if (c == 13) {
#ifdef ENABLE_SCUMM_7_8
/*#ifdef ENABLE_SCUMM_7_8
if (_game.version >= 7 && subtitleLine != subtitleBuffer) {
((ScummEngine_v7 *)this)->addSubtitleToQueue(subtitleBuffer, subtitlePos, _charsetColor, _charset->getCurID());
subtitleLine = subtitleBuffer;
}
#endif
#endif*/
if (!newLine())
break;
continue;
@ -762,12 +762,12 @@ void ScummEngine::CHARSET_1() {
if (_game.platform == Common::kPlatformFMTowns && (c == 0 || c == 2 || c == 3))
memcpy(&_curStringRect, &_charset->_str, sizeof(Common::Rect));
#endif
/*
#ifdef ENABLE_SCUMM_7_8
if (_game.version >= 7 && subtitleLine != subtitleBuffer) {
((ScummEngine_v7 *)this)->addSubtitleToQueue(subtitleBuffer, subtitlePos, _charsetColor, _charset->getCurID());
}
#endif
#endif*/
}
void ScummEngine::drawString(int a, const byte *msg) {