[Scummvm-cvs-logs] SF.net SVN: scummvm: [24785] scummvm/trunk/engines/cine
sev at users.sourceforge.net
sev at users.sourceforge.net
Fri Nov 24 21:25:55 CET 2006
Revision: 24785
http://svn.sourceforge.net/scummvm/?rev=24785&view=rev
Author: sev
Date: 2006-11-24 12:25:55 -0800 (Fri, 24 Nov 2006)
Log Message:
-----------
Let F10 work in all expected cases.
Modified Paths:
--------------
scummvm/trunk/engines/cine/main_loop.cpp
scummvm/trunk/engines/cine/script.cpp
scummvm/trunk/engines/cine/script.h
scummvm/trunk/engines/cine/various.cpp
scummvm/trunk/engines/cine/various.h
Modified: scummvm/trunk/engines/cine/main_loop.cpp
===================================================================
--- scummvm/trunk/engines/cine/main_loop.cpp 2006-11-24 18:50:21 UTC (rev 24784)
+++ scummvm/trunk/engines/cine/main_loop.cpp 2006-11-24 20:25:55 UTC (rev 24785)
@@ -119,7 +119,7 @@
}
break;
case 291: // F10
- if (allowPlayerInput && !inMenu) {
+ if (!disableSystemMenu && !inMenu) {
g_cine->makeSystemMenu();
}
break;
Modified: scummvm/trunk/engines/cine/script.cpp
===================================================================
--- scummvm/trunk/engines/cine/script.cpp 2006-11-24 18:50:21 UTC (rev 24784)
+++ scummvm/trunk/engines/cine/script.cpp 2006-11-24 20:25:55 UTC (rev 24785)
@@ -199,7 +199,7 @@
o1_playSample,
/* 78 */
o1_playSample,
- o1_allowSystemMenu,
+ o1_disableSystemMenu,
o1_loadMask5,
o1_unloadMask5
};
@@ -359,7 +359,7 @@
o1_playSample,
/* 78 */
o2_op78,
- o1_allowSystemMenu,
+ o1_disableSystemMenu,
o1_loadMask5,
o1_unloadMask5,
/* 7C */
@@ -1778,11 +1778,11 @@
}
}
-void o1_allowSystemMenu() {
+void o1_disableSystemMenu() {
byte param = getNextByte();
- debugC(5, kCineDebugScript, "Line: %d: allowSystemMenu(%d)", _currentLine, param);
- allowSystemMenu = param;
+ debugC(5, kCineDebugScript, "Line: %d: disableSystemMenu(%d)", _currentLine, param);
+ disableSystemMenu = (param != 0);
}
void o1_loadMask5() {
@@ -3191,7 +3191,7 @@
param = *(localScriptPtr + position);
position++;
- sprintf(lineBuffer, "allowSystemMenu(%d)\n", param);
+ sprintf(lineBuffer, "disableSystemMenu(%d)\n", param);
break;
}
Modified: scummvm/trunk/engines/cine/script.h
===================================================================
--- scummvm/trunk/engines/cine/script.h 2006-11-24 18:50:21 UTC (rev 24784)
+++ scummvm/trunk/engines/cine/script.h 2006-11-24 20:25:55 UTC (rev 24785)
@@ -139,7 +139,7 @@
void o1_op73();
void o1_playSample();
void o1_playSample();
-void o1_allowSystemMenu();
+void o1_disableSystemMenu();
void o1_loadMask5();
void o1_unloadMask5();
Modified: scummvm/trunk/engines/cine/various.cpp
===================================================================
--- scummvm/trunk/engines/cine/various.cpp 2006-11-24 18:50:21 UTC (rev 24784)
+++ scummvm/trunk/engines/cine/various.cpp 2006-11-24 20:25:55 UTC (rev 24785)
@@ -35,7 +35,7 @@
namespace Cine {
-int16 allowSystemMenu = 0;
+bool disableSystemMenu = false;
bool inMenu;
int16 commandVar3[4];
@@ -911,7 +911,7 @@
int16 mouseY;
int16 systemCommand;
- if (!allowSystemMenu) {
+ if (!disableSystemMenu) {
inMenu = true;
manageEvents();
@@ -1332,7 +1332,7 @@
}
}
- if (allowSystemMenu == 0) {
+ if (!disableSystemMenu) {
isDrawCommandEnabled = 1;
}
}
@@ -1362,7 +1362,7 @@
int16 oldSelection;
int16 var_4;
- if (allowSystemMenu)
+ if (disableSystemMenu)
return -1;
paramY = (height * 9) + 10;
@@ -1594,7 +1594,7 @@
int16 oldSelection;
int16 var_4;
- if (allowSystemMenu)
+ if (disableSystemMenu)
return -1;
paramY = (height * 9) + 10;
Modified: scummvm/trunk/engines/cine/various.h
===================================================================
--- scummvm/trunk/engines/cine/various.h 2006-11-24 18:50:21 UTC (rev 24784)
+++ scummvm/trunk/engines/cine/various.h 2006-11-24 20:25:55 UTC (rev 24785)
@@ -39,7 +39,7 @@
void makeCommandLine(void);
void makeActionMenu(void);
-extern int16 allowSystemMenu;
+extern bool disableSystemMenu;
extern bool inMenu;
struct unk1Struct {
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