[Scummvm-cvs-logs] SF.net SVN: scummvm: [31979] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 31979
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31979&view=rev
Author:   lordhoto
Date:     2008-05-10 11:23:11 -0700 (Sat, 10 May 2008)

Log Message:
-----------
- Added small delay to GUI_v2::getInput
- Prevent kyra3 background music from stopping while menu is open

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/gui_mr.cpp
    scummvm/trunk/engines/kyra/gui_mr.h
    scummvm/trunk/engines/kyra/gui_v2.cpp
    scummvm/trunk/engines/kyra/gui_v2.h

Modified: scummvm/trunk/engines/kyra/gui_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_mr.cpp	2008-05-10 18:14:57 UTC (rev 31978)
+++ scummvm/trunk/engines/kyra/gui_mr.cpp	2008-05-10 18:23:11 UTC (rev 31979)
@@ -704,6 +704,11 @@
 	}
 }
 
+void GUI_MR::getInput() {
+	_vm->musicUpdate(0);
+	GUI_v2::getInput();
+}
+
 const char *GUI_MR::getMenuTitle(const Menu &menu) {
 	if (!menu.menuNameId)
 		return 0;

Modified: scummvm/trunk/engines/kyra/gui_mr.h
===================================================================
--- scummvm/trunk/engines/kyra/gui_mr.h	2008-05-10 18:14:57 UTC (rev 31978)
+++ scummvm/trunk/engines/kyra/gui_mr.h	2008-05-10 18:23:11 UTC (rev 31979)
@@ -48,6 +48,8 @@
 
 	int optionsButton(Button *button);
 private:
+	void getInput();
+
 	const char *getMenuTitle(const Menu &menu);
 	const char *getMenuItemTitle(const MenuItem &menuItem);
 	const char *getMenuItemLabel(const MenuItem &menuItem);

Modified: scummvm/trunk/engines/kyra/gui_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_v2.cpp	2008-05-10 18:14:57 UTC (rev 31978)
+++ scummvm/trunk/engines/kyra/gui_v2.cpp	2008-05-10 18:23:11 UTC (rev 31979)
@@ -409,6 +409,8 @@
 		_isOptionsMenu = false;
 		_isDeleteMenu = false;
 	}
+
+	delay(10);
 }
 
 void GUI_v2::renewHighlight(Menu &menu) {

Modified: scummvm/trunk/engines/kyra/gui_v2.h
===================================================================
--- scummvm/trunk/engines/kyra/gui_v2.h	2008-05-10 18:14:57 UTC (rev 31978)
+++ scummvm/trunk/engines/kyra/gui_v2.h	2008-05-10 18:23:11 UTC (rev 31979)
@@ -125,7 +125,7 @@
 	virtual uint8 textFieldColor2() const = 0;
 	virtual uint8 textFieldColor3() const = 0;
 protected:
-	void getInput();
+	virtual void getInput();
 
 	Button _menuButtons[7];
 	Button _scrollUpButton;


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