aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction/parallaction_ns.cpp
diff options
context:
space:
mode:
authorNicola Mettifogo2008-01-09 21:46:57 +0000
committerNicola Mettifogo2008-01-09 21:46:57 +0000
commitbdf440fdaebf74e07ff6889c15b11ab61a8c7e59 (patch)
tree40a673b0049bd8d0a6e6e096145b59c2cc2cb0ff /engines/parallaction/parallaction_ns.cpp
parent29d1749db5496f37dc053ccecba3fc1a7606289d (diff)
downloadscummvm-rg350-bdf440fdaebf74e07ff6889c15b11ab61a8c7e59.tar.gz
scummvm-rg350-bdf440fdaebf74e07ff6889c15b11ab61a8c7e59.tar.bz2
scummvm-rg350-bdf440fdaebf74e07ff6889c15b11ab61a8c7e59.zip
Replaced the remaining old string code with the new label code. All the text is now drawn in the framebuffer instead of being blitted onto the internal game screen buffer.
svn-id: r30360
Diffstat (limited to 'engines/parallaction/parallaction_ns.cpp')
-rw-r--r--engines/parallaction/parallaction_ns.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp
index 516f20e6c6..609235bb68 100644
--- a/engines/parallaction/parallaction_ns.cpp
+++ b/engines/parallaction/parallaction_ns.cpp
@@ -184,7 +184,7 @@ void Parallaction_ns::setArrowCursor() {
debugC(1, kDebugInput, "setting mouse cursor to arrow");
// this stuff is needed to avoid artifacts with labels and selected items when switching cursors
- _gfx->setLabel(0);
+ _gfx->setFloatingLabel(0);
_activeItem._id = 0;
_system->setMouseCursor(_mouseArrow, MOUSEARROW_WIDTH, MOUSEARROW_HEIGHT, 0, 0, 0);
@@ -298,7 +298,8 @@ void Parallaction_ns::changeLocation(char *location) {
// WORKAROUND: this hideLabel has been added to avoid crashes caused by
// execution of label jobs after a location switch. The other workaround in
// Parallaction::runGame should have been rendered useless by this one.
- _gfx->setLabel(0);
+ _gfx->setFloatingLabel(0);
+ _gfx->freeLabels();
_hoverZone = NULL;
if (_engineFlags & kEngineBlockInput) {
@@ -320,10 +321,10 @@ void Parallaction_ns::changeLocation(char *location) {
if (locname.hasSlide()) {
showSlide(locname.slide());
- _gfx->setFont(_menuFont);
- _gfx->displayCenteredString(14, _slideText[0]); // displays text on screen
- _gfx->updateScreen();
+ uint id = _gfx->createLabel(_menuFont, _slideText[0], 1);
+ _gfx->showLabel(id, CENTER_LABEL_HORIZONTAL, 14);
waitUntilLeftClick();
+ _gfx->freeLabels();
}
if (locname.hasCharacter()) {