[Scummvm-cvs-logs] SF.net SVN: scummvm:[45673] scummvm/trunk/engines/sci/gui

[m_kiewitz at users.sourceforge.net]

Revision: 45673
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45673&view=rev
Author:   m_kiewitz
Date:     2009-11-04 16:16:55 +0000 (Wed, 04 Nov 2009)

Log Message:
-----------
SCI/newgui: SciGuiMenu select() created, little cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gui/gui.cpp
    scummvm/trunk/engines/sci/gui/gui_menu.cpp
    scummvm/trunk/engines/sci/gui/gui_menu.h

Modified: scummvm/trunk/engines/sci/gui/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.cpp	2009-11-04 16:11:46 UTC (rev 45672)
+++ scummvm/trunk/engines/sci/gui/gui.cpp	2009-11-04 16:16:55 UTC (rev 45673)
@@ -327,7 +327,7 @@
 }
 
 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) {

Modified: scummvm/trunk/engines/sci/gui/gui_menu.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_menu.cpp	2009-11-04 16:11:46 UTC (rev 45672)
+++ scummvm/trunk/engines/sci/gui/gui_menu.cpp	2009-11-04 16:16:55 UTC (rev 45673)
@@ -249,18 +249,15 @@
 		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 @@
 	_gfx->BitsShow(_gfx->_menuRect);
 }
 
+reg_t SciGuiMenu::select(reg_t eventObject) {
+	return NULL_REG;
+}
+
 } // End of namespace Sci

Modified: scummvm/trunk/engines/sci/gui/gui_menu.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_menu.h	2009-11-04 16:11:46 UTC (rev 45672)
+++ scummvm/trunk/engines/sci/gui/gui_menu.h	2009-11-04 16:16:55 UTC (rev 45673)
@@ -84,6 +84,7 @@
 	reg_t getAttribute(uint16 menuId, uint16 itemId, uint16 attributeId);
 
 	void drawBar();
+	reg_t select(reg_t eventObject);
 
 private:
 	GuiMenuItemEntry *findItem(uint16 menuId, uint16 itemId);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.