[Scummvm-cvs-logs] SF.net SVN: scummvm: [31336] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Sun Mar 30 20:41:11 CEST 2008
Revision: 31336
http://scummvm.svn.sourceforge.net/scummvm/?rev=31336&view=rev
Author: lordhoto
Date: 2008-03-30 11:41:11 -0700 (Sun, 30 Mar 2008)
Log Message:
-----------
Implement quit flag handling in Kyra2 GUI code.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/gui_v2.cpp
scummvm/trunk/engines/kyra/gui_v2.h
Modified: scummvm/trunk/engines/kyra/gui_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_v2.cpp 2008-03-30 18:37:27 UTC (rev 31335)
+++ scummvm/trunk/engines/kyra/gui_v2.cpp 2008-03-30 18:41:11 UTC (rev 31336)
@@ -1155,6 +1155,14 @@
#pragma mark -
+void GUI_v2::getInput() {
+ _vm->checkInput(_menuButtonList);
+ if (_vm->quit()) {
+ _displayMenu = false;
+ _displaySubMenu = false;
+ }
+}
+
int GUI_v2::optionsButton(Button *button) {
_restartGame = false;
_reloadTemporarySave = false;
@@ -1348,7 +1356,7 @@
while (_displaySubMenu) {
Common::Point mouse = _vm->getMousePos();
processHighlights(_loadMenu, mouse.x, mouse.y);
- _vm->checkInput(_menuButtonList);
+ getInput();
}
if (_cancelSubMenu) {
Modified: scummvm/trunk/engines/kyra/gui_v2.h
===================================================================
--- scummvm/trunk/engines/kyra/gui_v2.h 2008-03-30 18:37:27 UTC (rev 31335)
+++ scummvm/trunk/engines/kyra/gui_v2.h 2008-03-30 18:41:11 UTC (rev 31336)
@@ -106,6 +106,8 @@
int optionsButton(Button *button);
private:
+ void getInput();
+
Button _menuButtons[7];
Button _scrollUpButton;
Button _scrollDownButton;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list