libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-27 05:32:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI/newgui: kDisplay fixed so text centering will work correctly (based on sierra sci disassembly) - fixes kq5 credits, lb2 intro selection

Browse Source 
svn-id: r45264
This commit is contained in:
Martin Kiewitz 2009-10-20 12:00:37 +00:00
parent 255349b262
commit 53e08b32e8
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
engines/sci/gui/gui.cpp
View File

@ -177,7 +177,7 @@ void SciGui::display(const char *text, int argc, reg_t *argv) {
GuiTextAlignment alignment = SCI_TEXT_ALIGNMENT_LEFT; GuiTextAlignment alignment = SCI_TEXT_ALIGNMENT_LEFT;
int16 bgcolor = -1, width = -1, bRedraw = 1; int16 bgcolor = -1, width = -1, bRedraw = 1;
bool doSaveUnder = false; bool doSaveUnder = false;
Common::Rect rect, *orect = &((GuiWindow *)_gfx->GetPort())->dims; Common::Rect rect;
// Make a "backup" of the port settings // Make a "backup" of the port settings
GuiPort oldPort = *_gfx->GetPort(); GuiPort oldPort = *_gfx->GetPort();
@ -239,15 +239,12 @@ void SciGui::display(const char *text, int argc, reg_t *argv) {
} }
} }
// FIXME: this code seems to be broken somewhat. KQ5 sets coordinates to 90, 80 and sets width to 320
// our code can not handle this currently, so the text wont get centered as it should
// clipping coordinates to 0, 0 isnt working either, because kq5 writes to coordinates 90, 80 AND 89, 80
// to create a shadow of the font. Investigation into disassembly needed
// now drawing the text // now drawing the text
_gfx->TextSize(rect, text, -1, width); _gfx->TextSize(rect, text, -1, width);
_gfx->Move((orect->left <= _screen->_width ? 0 : _screen->_width - orect->left), (orect->top <= _screen->_height ? 0 : _screen->_height - orect->top)); // move port to (0,0)
rect.moveTo(_gfx->GetPort()->curLeft, _gfx->GetPort()->curTop); rect.moveTo(_gfx->GetPort()->curLeft, _gfx->GetPort()->curTop);
_gfx->Move(rect.right <= _screen->_width ? 0 : _screen->_width - rect.right, rect.bottom <= _screen->_height ? 0 : _screen->_width - rect.bottom);
rect.moveTo(_gfx->GetPort()->curLeft, _gfx->GetPort()->curTop);
if (doSaveUnder) if (doSaveUnder)
_s->r_acc = _gfx->BitsSave(rect, SCI_SCREEN_MASK_VISUAL); _s->r_acc = _gfx->BitsSave(rect, SCI_SCREEN_MASK_VISUAL);
if (bgcolor != -1) if (bgcolor != -1)