diff options
author | Paul Gilbert | 2015-06-18 19:21:04 -0400 |
---|---|---|
committer | Paul Gilbert | 2015-06-18 19:21:04 -0400 |
commit | 1732428aa63c35c3989568fbc3a3e9c63bc8482c (patch) | |
tree | 915d16465e39c28b65c84b7e2d7f1688a16bacf2 /engines/sherlock/tattoo | |
parent | f6c710e5b33b72723c4983bc498a4127497d772e (diff) | |
download | scummvm-rg350-1732428aa63c35c3989568fbc3a3e9c63bc8482c.tar.gz scummvm-rg350-1732428aa63c35c3989568fbc3a3e9c63bc8482c.tar.bz2 scummvm-rg350-1732428aa63c35c3989568fbc3a3e9c63bc8482c.zip |
SHERLOCK: RT: Implement font _yOffsets table
Since this table must only be set up for RT when changing fonts, I
needed to put an engine reference in the Fonts base class. Because
of this, I've been able to simplify the creation of the various
surfaces, since you no longer need to pass in the platform
Diffstat (limited to 'engines/sherlock/tattoo')
-rw-r--r-- | engines/sherlock/tattoo/tattoo_map.cpp | 10 | ||||
-rw-r--r-- | engines/sherlock/tattoo/widget_tooltip.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/sherlock/tattoo/tattoo_map.cpp b/engines/sherlock/tattoo/tattoo_map.cpp index 3be97c8b84..b4ce767976 100644 --- a/engines/sherlock/tattoo/tattoo_map.cpp +++ b/engines/sherlock/tattoo/tattoo_map.cpp @@ -105,7 +105,7 @@ int TattooMap::show() { // Load the map image and draw it to the back buffer ImageFile *map = new ImageFile("map.vgs"); - screen._backBuffer1.create(SHERLOCK_SCREEN_WIDTH * 2, SHERLOCK_SCREEN_HEIGHT * 2, _vm->getPlatform()); + screen._backBuffer1.create(SHERLOCK_SCREEN_WIDTH * 2, SHERLOCK_SCREEN_HEIGHT * 2); screen._backBuffer1.blitFrom((*map)[0], Common::Point(0, 0)); delete map; @@ -114,7 +114,7 @@ int TattooMap::show() { drawMapIcons(); // Copy the map drawn in the back buffer to the secondary back buffer - screen._backBuffer2.create(SHERLOCK_SCREEN_WIDTH * 2, SHERLOCK_SCREEN_HEIGHT * 2, _vm->getPlatform()); + screen._backBuffer2.create(SHERLOCK_SCREEN_WIDTH * 2, SHERLOCK_SCREEN_HEIGHT * 2); screen._backBuffer2.blitFrom(screen._backBuffer1); // Display the built map to the screen @@ -231,8 +231,8 @@ int TattooMap::show() { _textBuffer = nullptr; // Reset the back buffers back to standard size - screen._backBuffer1.create(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT, _vm->getPlatform()); - screen._backBuffer2.create(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT, _vm->getPlatform()); + screen._backBuffer1.create(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT); + screen._backBuffer2.create(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT); return result; } @@ -391,7 +391,7 @@ void TattooMap::checkMapNames(bool slamIt) { delete _textBuffer; // Allocate a new surface - _textBuffer = new Surface(width, height, _vm->getPlatform()); + _textBuffer = new Surface(width, height); _textBuffer->fillRect(Common::Rect(0, 0, width, height), TRANSPARENCY); if (space == nullptr) { diff --git a/engines/sherlock/tattoo/widget_tooltip.cpp b/engines/sherlock/tattoo/widget_tooltip.cpp index 7d513b7af7..b5016bec75 100644 --- a/engines/sherlock/tattoo/widget_tooltip.cpp +++ b/engines/sherlock/tattoo/widget_tooltip.cpp @@ -111,7 +111,7 @@ void WidgetTooltip::execute() { } // Reallocate the text surface with the new size - _surface.create(width, height, _vm->getPlatform()); + _surface.create(width, height); _surface.fill(TRANSPARENCY); if (line2.empty()) { |