libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 13:50:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't allow the F9 and F10 keys to open menus if a menu is already open. (Might

Browse Source 
need more testing.)

svn-id: r24747
This commit is contained in:
Torbjörn Andersson 2006-11-19 18:54:06 +00:00
parent 39b27ed3bb
commit 50e2cf9caa
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engines/cine/main_loop.cpp
View File

@ -113,13 +113,13 @@ void manageEvents(int count) {
}
break;
case 290: // F9
if (allowPlayerInput) {
if (allowPlayerInput && !inMenu) {
makeActionMenu();
makeCommandLine();
}
break;
case 291: // F10
if (allowPlayerInput) {
if (allowPlayerInput && !inMenu) {
g_cine->makeSystemMenu();
}
break;
@ -207,6 +207,7 @@ void mainLoop(int bootScriptIdx) {
gfxFuncGen2();
quitFlag = 0;
inMenu = false;
allowPlayerInput = 0;
checkForPendingDataLoadSwitch = 0;

11
engines/cine/various.cpp
View File

@ -36,6 +36,7 @@
namespace Cine {
int16 allowSystemMenu = 0;
bool inMenu;
int16 commandVar3[4];
int16 commandVar1;
@ -911,6 +912,8 @@ void CineEngine::makeSystemMenu(void) {
int16 systemCommand;
if (!allowSystemMenu) {
inMenu = true;
manageEvents();
getMouseData(mouseUpdateStatus, (uint16 *)&mouseButton,(uint16 *)&mouseX, (uint16 *)&mouseY);
@ -1038,6 +1041,8 @@ void CineEngine::makeSystemMenu(void) {
break;
}
}
inMenu = false;
}
}
@ -1841,6 +1846,8 @@ void makeActionMenu(void) {
uint16 mouseX;
uint16 mouseY;
inMenu = true;
getMouseData(mouseUpdateStatus, &mouseButton, &mouseX, &mouseY);
if (g_cine->getGameType() == Cine::GType_OS) {
@ -1851,8 +1858,10 @@ void makeActionMenu(void) {
canUseOnObject = 1;
}
} else {
playerCommand = makeMenuChoice(defaultActionCommand, 6, mouseX, mouseY, 70);
playerCommand = makeMenuChoice(defaultActionCommand, 6, mouseX, mouseY, 70);
}
inMenu = false;
}
uint16 executePlayerInput(void) {

1
engines/cine/various.h
View File

@ -40,6 +40,7 @@ void makeCommandLine(void);
void makeActionMenu(void);
extern int16 allowSystemMenu;
extern bool inMenu;
struct unk1Struct {
byte *ptr;