diff options
| author | Matthew Hoops | 2011-10-07 14:34:22 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-10-07 14:34:22 -0400 |
| commit | e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5 (patch) | |
| tree | 9d57b5fdd6737bc3449851a87e573abe7be984a6 /engines/sword1/menu.cpp | |
| parent | deab5b28753155863062746ef1239535f562fd0b (diff) | |
| parent | 842b471e45ae8b7c1b4516b9bd5bf39d61112077 (diff) | |
| download | scummvm-rg350-e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5.tar.gz scummvm-rg350-e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5.tar.bz2 scummvm-rg350-e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
video/qt_decoder.cpp
Diffstat (limited to 'engines/sword1/menu.cpp')
| -rw-r--r-- | engines/sword1/menu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sword1/menu.cpp b/engines/sword1/menu.cpp index 3a99602fec..f61e10106a 100644 --- a/engines/sword1/menu.cpp +++ b/engines/sword1/menu.cpp @@ -85,7 +85,7 @@ void MenuIcon::setSelect(bool pSel) { void MenuIcon::draw(const byte *fadeMask, int8 fadeStatus) { uint16 x = _menuPos * 40; - uint16 y = (_menuType == MENU_TOP)?(0):(440); + uint16 y = (_menuType == MENU_TOP) ? (0) : (440); _screen->showFrame(x, y, _resId, _frame + (_selected ? 1 : 0), fadeMask, fadeStatus); } @@ -193,7 +193,7 @@ uint8 Menu::checkMenuClick(uint8 menuType) { _mouse->setLuggage(0, 0); Logic::_scriptVars[OBJECT_HELD] = 0; // reselected => deselect it } else { // the player is clicking another item on this one. - // run its use-script, if there is one + // run its use-script, if there is one Logic::_scriptVars[SECOND_ITEM] = _menuList[cnt]; _mouse->setLuggage(0, 0); } |