thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: making most of the variables in screen class private (some of it was needed for old gui)

Browse source 
svn-id: r47075
This commit is contained in:
Martin Kiewitz 2010-01-06 13:05:14 +00:00
parent 86c1171b11
commit 7d7d23ce2b
11 changed files with 43 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/sci/graphics/menu.cpp
View file

@ -285,7 +285,7 @@ void Menu::drawBar() {
GuiMenuList::iterator listEnd = _list.end();
// Hardcoded black on white
_gfx->FillRect(_gfx->_menuBarRect, 1, _screen->_colorWhite);
_gfx->FillRect(_gfx->_menuBarRect, 1, _screen->getColorWhite());
_gfx->PenColor(0);
_gfx->MoveTo(8, 1);
@ -503,7 +503,7 @@ void Menu::drawMenu(uint16 oldMenuId, uint16 newMenuId) {
// Do the drawing
_gfx->FillRect(_menuRect, SCI_SCREEN_MASK_VISUAL, 0);
_menuRect.left++; _menuRect.right--; _menuRect.bottom--;
_gfx->FillRect(_menuRect, SCI_SCREEN_MASK_VISUAL, _screen->_colorWhite);
_gfx->FillRect(_menuRect, SCI_SCREEN_MASK_VISUAL, _screen->getColorWhite());
_menuRect.left += 8;
topPos = _menuRect.top + 1;
@ -564,7 +564,7 @@ GuiMenuItemEntry *Menu::interactiveWithKeyboard() {
_barSaveHandle = _gfx->BitsSave(_gfx->_menuBarRect, SCI_SCREEN_MASK_VISUAL);
_gfx->PenColor(0);
_gfx->BackColor(_screen->_colorWhite);
_gfx->BackColor(_screen->getColorWhite());
drawBar();
drawMenu(0, curItemEntry->menuId);