diff options
author | Johannes Schickel | 2016-03-21 02:50:15 +0100 |
---|---|---|
committer | Johannes Schickel | 2016-03-21 16:24:14 +0100 |
commit | fc17d9750f08102bd13b6b7a5c5bb340b0a913bc (patch) | |
tree | 70b5ecd97bcb7040ad1be2f528c84124dcfaf22a /engines/sherlock/scalpel/scalpel_inventory.cpp | |
parent | 892aa2886cee1ccf829e90fc72a941de22c49467 (diff) | |
download | scummvm-rg350-fc17d9750f08102bd13b6b7a5c5bb340b0a913bc.tar.gz scummvm-rg350-fc17d9750f08102bd13b6b7a5c5bb340b0a913bc.tar.bz2 scummvm-rg350-fc17d9750f08102bd13b6b7a5c5bb340b0a913bc.zip |
SHERLOCK: Make Screen::_backBuffer protected.
Diffstat (limited to 'engines/sherlock/scalpel/scalpel_inventory.cpp')
-rw-r--r-- | engines/sherlock/scalpel/scalpel_inventory.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/sherlock/scalpel/scalpel_inventory.cpp b/engines/sherlock/scalpel/scalpel_inventory.cpp index e8d4d3b934..6eb8c2c05c 100644 --- a/engines/sherlock/scalpel/scalpel_inventory.cpp +++ b/engines/sherlock/scalpel/scalpel_inventory.cpp @@ -72,11 +72,11 @@ void ScalpelInventory::drawInventory(InvNewMode mode) { loadInv(); if (mode == INVENTORY_DONT_DISPLAY) { - screen._backBuffer = &screen._backBuffer2; + screen.activateBackBuffer2(); } // Draw the window background - Surface &bb = *screen._backBuffer; + Surface &bb = *screen.getBackBuffer(); bb.fillRect(Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, CONTROLS_Y1 + 10), BORDER_COLOR); bb.fillRect(Common::Rect(0, CONTROLS_Y1 + 10, 2, SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR); bb.fillRect(Common::Rect(SHERLOCK_SCREEN_WIDTH - 2, CONTROLS_Y1 + 10, @@ -128,7 +128,7 @@ void ScalpelInventory::drawInventory(InvNewMode mode) { ui._windowOpen = true; } else { // Reset the screen back buffer to the first buffer now that drawing is done - screen._backBuffer = &screen._backBuffer1; + screen.activateBackBuffer1(); } assert(IS_SERRATED_SCALPEL); @@ -196,7 +196,7 @@ void ScalpelInventory::invCommands(bool slamIt) { void ScalpelInventory::highlight(int index, byte color) { Screen &screen = *_vm->_screen; - Surface &bb = *screen._backBuffer; + Surface &bb = *screen.getBackBuffer(); int slot = index - _invIndex; ImageFrame &frame = (*_invShapes[slot])[0]; @@ -278,9 +278,9 @@ void ScalpelInventory::putInv(InvSlamMode slamIt) { invCommands(0); } else if (slamIt == SLAM_SECONDARY_BUFFER) { - screen._backBuffer = &screen._backBuffer2; + screen.activateBackBuffer2(); invCommands(0); - screen._backBuffer = &screen._backBuffer1; + screen.activateBackBuffer1(); } } |