diff options
| author | Martin Kiewitz | 2009-11-04 16:16:55 +0000 | 
|---|---|---|
| committer | Martin Kiewitz | 2009-11-04 16:16:55 +0000 | 
| commit | c975c288eedbe4f2e0fea320148e3318aed57c97 (patch) | |
| tree | 85d834de2741c768b982d32a6511f05a785cbe6b | |
| parent | 5910e32b36d99a7b417f58a98b6399815aff724b (diff) | |
| download | scummvm-rg350-c975c288eedbe4f2e0fea320148e3318aed57c97.tar.gz scummvm-rg350-c975c288eedbe4f2e0fea320148e3318aed57c97.tar.bz2 scummvm-rg350-c975c288eedbe4f2e0fea320148e3318aed57c97.zip | |
SCI/newgui: SciGuiMenu select() created, little cleanup
svn-id: r45673
| -rw-r--r-- | engines/sci/gui/gui.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/gui/gui_menu.cpp | 9 | ||||
| -rw-r--r-- | engines/sci/gui/gui_menu.h | 1 | 
3 files changed, 7 insertions, 5 deletions
| diff --git a/engines/sci/gui/gui.cpp b/engines/sci/gui/gui.cpp index 18ef57f9fd..cb8674f53a 100644 --- a/engines/sci/gui/gui.cpp +++ b/engines/sci/gui/gui.cpp @@ -327,7 +327,7 @@ reg_t SciGui::menuGet(uint16 menuId, uint16 itemId, uint16 attributeId) {  }  reg_t SciGui::menuSelect(reg_t eventObject) { -	return NULL_REG; +	return _menu->select(eventObject);  }  void SciGui::drawPicture(GuiResourceId pictureId, int16 animationNr, bool animationBlackoutFlag, bool mirroredFlag, bool addToFlag, int16 EGApaletteNo) { diff --git a/engines/sci/gui/gui_menu.cpp b/engines/sci/gui/gui_menu.cpp index 7c81b8a017..9462522c0c 100644 --- a/engines/sci/gui/gui_menu.cpp +++ b/engines/sci/gui/gui_menu.cpp @@ -249,18 +249,15 @@ reg_t SciGuiMenu::getAttribute(uint16 menuId, uint16 itemId, uint16 attributeId)  		break;  	case SCI_MENU_ATTRIBUTE_SAID:  		return itemEntry->saidVmPtr; -		break;  	case SCI_MENU_ATTRIBUTE_TEXT:  		return itemEntry->textVmPtr; -		break;  	case SCI_MENU_ATTRIBUTE_KEYPRESS:  		// TODO: Find out how modifier is handled  		return make_reg(0, itemEntry->keyPress); -		break;  	case SCI_MENU_ATTRIBUTE_TAG:  		return make_reg(0, itemEntry->tag);  	default: -		error("setAttribute() called with unsupported attributeId %X", attributeId); +		error("getAttribute() called with unsupported attributeId %X", attributeId);  	}  	return NULL_REG;  } @@ -285,4 +282,8 @@ void SciGuiMenu::drawBar() {  	_gfx->BitsShow(_gfx->_menuRect);  } +reg_t SciGuiMenu::select(reg_t eventObject) { +	return NULL_REG; +} +  } // End of namespace Sci diff --git a/engines/sci/gui/gui_menu.h b/engines/sci/gui/gui_menu.h index c511ea7c95..8953a1f7c8 100644 --- a/engines/sci/gui/gui_menu.h +++ b/engines/sci/gui/gui_menu.h @@ -84,6 +84,7 @@ public:  	reg_t getAttribute(uint16 menuId, uint16 itemId, uint16 attributeId);  	void drawBar(); +	reg_t select(reg_t eventObject);  private:  	GuiMenuItemEntry *findItem(uint16 menuId, uint16 itemId); | 
