aboutsummaryrefslogtreecommitdiff
path: root/engines/gob/minigames/geisha
diff options
context:
space:
mode:
authorSven Hesse2012-06-30 01:46:24 +0200
committerSven Hesse2012-07-30 01:24:18 +0200
commit00fa997039525eeeacc34734e9a12e53f7b847dd (patch)
tree982fe2588bed0934e18cd04c57fb1f63755633c6 /engines/gob/minigames/geisha
parentb5fa752b78c63bedcb53d38fb11244b7e99f9941 (diff)
downloadscummvm-rg350-00fa997039525eeeacc34734e9a12e53f7b847dd.tar.gz
scummvm-rg350-00fa997039525eeeacc34734e9a12e53f7b847dd.tar.bz2
scummvm-rg350-00fa997039525eeeacc34734e9a12e53f7b847dd.zip
GOB: Move drawString into Font
Diffstat (limited to 'engines/gob/minigames/geisha')
-rw-r--r--engines/gob/minigames/geisha/penetration.cpp45
1 files changed, 18 insertions, 27 deletions
diff --git a/engines/gob/minigames/geisha/penetration.cpp b/engines/gob/minigames/geisha/penetration.cpp
index 05695e5dbb..c8c4f2bba7 100644
--- a/engines/gob/minigames/geisha/penetration.cpp
+++ b/engines/gob/minigames/geisha/penetration.cpp
@@ -778,29 +778,24 @@ void Penetration::drawFloorText() {
else if (_floor == 2)
floorString = strings[kString1stBasement];
+ Surface &surface = *_vm->_draw->_backSurface;
+
if (floorString)
- _vm->_draw->drawString(floorString, 10, 15, kColorFloorText, kColorBlack, 1,
- *_vm->_draw->_backSurface, *font);
+ font->drawString(floorString, 10, 15, kColorFloorText, kColorBlack, 1, surface);
if (_exits.size() > 0) {
int exitCount = kString2Exits;
if (_exits.size() == 1)
exitCount = kString1Exit;
- _vm->_draw->drawString(strings[kStringYouHave] , 10, 38, kColorExitText, kColorBlack, 1,
- *_vm->_draw->_backSurface, *font);
- _vm->_draw->drawString(strings[exitCount] , 10, 53, kColorExitText, kColorBlack, 1,
- *_vm->_draw->_backSurface, *font);
- _vm->_draw->drawString(strings[kStringToReach] , 10, 68, kColorExitText, kColorBlack, 1,
- *_vm->_draw->_backSurface, *font);
- _vm->_draw->drawString(strings[kStringUpperLevel1], 10, 84, kColorExitText, kColorBlack, 1,
- *_vm->_draw->_backSurface, *font);
- _vm->_draw->drawString(strings[kStringUpperLevel2], 10, 98, kColorExitText, kColorBlack, 1,
- *_vm->_draw->_backSurface, *font);
+ font->drawString(strings[kStringYouHave] , 10, 38, kColorExitText, kColorBlack, 1, surface);
+ font->drawString(strings[exitCount] , 10, 53, kColorExitText, kColorBlack, 1, surface);
+ font->drawString(strings[kStringToReach] , 10, 68, kColorExitText, kColorBlack, 1, surface);
+ font->drawString(strings[kStringUpperLevel1], 10, 84, kColorExitText, kColorBlack, 1, surface);
+ font->drawString(strings[kStringUpperLevel2], 10, 98, kColorExitText, kColorBlack, 1, surface);
} else
- _vm->_draw->drawString(strings[kStringNoExit], 10, 53, kColorExitText, kColorBlack, 1,
- *_vm->_draw->_backSurface, *font);
+ font->drawString(strings[kStringNoExit], 10, 53, kColorExitText, kColorBlack, 1, surface);
}
void Penetration::drawEndText() {
@@ -814,21 +809,17 @@ void Penetration::drawEndText() {
if (!font)
return;
+ Surface &surface = *_vm->_draw->_backSurface;
+
const char **strings = kStrings[getLanguage()];
- _vm->_draw->drawString(strings[kStringLevel0] , 11, 21, kColorExitText, kColorBlack, 1,
- *_vm->_draw->_backSurface, *font);
- _vm->_draw->drawString(strings[kStringPenetration], 11, 42, kColorExitText, kColorBlack, 1,
- *_vm->_draw->_backSurface, *font);
- _vm->_draw->drawString(strings[kStringSuccessful] , 11, 58, kColorExitText, kColorBlack, 1,
- *_vm->_draw->_backSurface, *font);
-
- _vm->_draw->drawString(strings[kStringDanger] , 11, 82, kColorFloorText, kColorBlack, 1,
- *_vm->_draw->_backSurface, *font);
- _vm->_draw->drawString(strings[kStringGynoides] , 11, 98, kColorFloorText, kColorBlack, 1,
- *_vm->_draw->_backSurface, *font);
- _vm->_draw->drawString(strings[kStringActivated], 11, 113, kColorFloorText, kColorBlack, 1,
- *_vm->_draw->_backSurface, *font);
+ font->drawString(strings[kStringLevel0] , 11, 21, kColorExitText, kColorBlack, 1, surface);
+ font->drawString(strings[kStringPenetration], 11, 42, kColorExitText, kColorBlack, 1, surface);
+ font->drawString(strings[kStringSuccessful] , 11, 58, kColorExitText, kColorBlack, 1, surface);
+
+ font->drawString(strings[kStringDanger] , 11, 82, kColorFloorText, kColorBlack, 1, surface);
+ font->drawString(strings[kStringGynoides] , 11, 98, kColorFloorText, kColorBlack, 1, surface);
+ font->drawString(strings[kStringActivated], 11, 113, kColorFloorText, kColorBlack, 1, surface);
_vm->_draw->dirtiedRect(_vm->_draw->_backSurface, kTextAreaLeft, kTextAreaTop, kTextAreaRight, kTextAreaBigBottom);
_vm->_draw->blitInvalidated();