diff options
| author | Johannes Schickel | 2008-04-12 23:17:21 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-04-12 23:17:21 +0000 |
| commit | 1f91dc03846caecc0651101f54ad25f1864ae132 (patch) | |
| tree | bcb81be8cb19781ef4098810f8aacafe755cbf48 /engines/kyra/gui_v1.cpp | |
| parent | 91e1a6b7be34e2cbb52826c28ce210b15bb19f1e (diff) | |
| download | scummvm-rg350-1f91dc03846caecc0651101f54ad25f1864ae132.tar.gz scummvm-rg350-1f91dc03846caecc0651101f54ad25f1864ae132.tar.bz2 scummvm-rg350-1f91dc03846caecc0651101f54ad25f1864ae132.zip | |
- some refactoring for Kyra3
- removed unneeded map code in KyraEngine_v3
svn-id: r31488
Diffstat (limited to 'engines/kyra/gui_v1.cpp')
| -rw-r--r-- | engines/kyra/gui_v1.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/kyra/gui_v1.cpp b/engines/kyra/gui_v1.cpp index fd6e0cbdf5..61129956b6 100644 --- a/engines/kyra/gui_v1.cpp +++ b/engines/kyra/gui_v1.cpp @@ -186,7 +186,7 @@ int KyraEngine_v1::buttonAmuletCallback(Button *caller) { #pragma mark - -GUI_v1::GUI_v1(KyraEngine_v1 *vm) : GUI(vm), _vm(vm) { +GUI_v1::GUI_v1(KyraEngine_v1 *vm, Screen_v1 *screen) : GUI(vm), _vm(vm), _screen(screen) { _menu = 0; initStaticResource(); _scrollUpFunctor = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::scrollUp); @@ -212,16 +212,16 @@ int GUI_v1::processButtonList(Button *list, uint16 inputFlag) { int x = list->x; int y = list->y; - assert(list->dimTableIndex < _screen->_screenDimTableCount); + assert(_screen->getScreenDim(list->dimTableIndex) != 0); if (x < 0) { - x += _screen->_screenDimTable[list->dimTableIndex].w << 3; + x += _screen->getScreenDim(list->dimTableIndex)->w << 3; } - x += _screen->_screenDimTable[list->dimTableIndex].sx << 3; + x += _screen->getScreenDim(list->dimTableIndex)->sx << 3; if (y < 0) { - y += _screen->_screenDimTable[list->dimTableIndex].h; + y += _screen->getScreenDim(list->dimTableIndex)->h; } - y += _screen->_screenDimTable[list->dimTableIndex].sy; + y += _screen->getScreenDim(list->dimTableIndex)->sy; Common::Point mouse = _vm->getMousePos(); if (mouse.x >= x && mouse.y >= y && x + list->width >= mouse.x && y + list->height >= mouse.y) { @@ -302,12 +302,12 @@ void GUI_v1::processButton(Button *button) { int x = button->x; int y = button->y; - assert(button->dimTableIndex < _screen->_screenDimTableCount); + assert(_screen->getScreenDim(button->dimTableIndex) != 0); if (x < 0) - x += _screen->_screenDimTable[button->dimTableIndex].w << 3; + x += _screen->getScreenDim(button->dimTableIndex)->w << 3; if (y < 0) - y += _screen->_screenDimTable[button->dimTableIndex].h; + y += _screen->getScreenDim(button->dimTableIndex)->h; if (processType == 1 && shape) _screen->drawShape(_screen->_curPage, shape, x, y, button->dimTableIndex, 0x10); |