[Scummvm-cvs-logs] SF.net SVN: scummvm:[48465] scummvm/branches/branch-1-1-0/engines/ parallaction
Kirben at users.sourceforge.net
Kirben at users.sourceforge.net
Fri Apr 2 14:55:34 CEST 2010
Revision: 48465
http://scummvm.svn.sourceforge.net/scummvm/?rev=48465&view=rev
Author: Kirben
Date: 2010-04-02 12:55:32 +0000 (Fri, 02 Apr 2010)
Log Message:
-----------
Backport fix for bug #2979193 - NIPPON: Crash at character introduction (regression). By restoring the kEngineBlockInput engine flag.
Modified Paths:
--------------
scummvm/branches/branch-1-1-0/engines/parallaction/callables_ns.cpp
scummvm/branches/branch-1-1-0/engines/parallaction/gui_ns.cpp
scummvm/branches/branch-1-1-0/engines/parallaction/input.cpp
scummvm/branches/branch-1-1-0/engines/parallaction/parallaction.h
Modified: scummvm/branches/branch-1-1-0/engines/parallaction/callables_ns.cpp
===================================================================
--- scummvm/branches/branch-1-1-0/engines/parallaction/callables_ns.cpp 2010-04-02 12:51:42 UTC (rev 48464)
+++ scummvm/branches/branch-1-1-0/engines/parallaction/callables_ns.cpp 2010-04-02 12:55:32 UTC (rev 48465)
@@ -298,9 +298,11 @@
void Parallaction_ns::_c_offMouse(void *parm) {
_input->setMouseState(MOUSE_DISABLED);
+ _engineFlags |= kEngineBlockInput;
}
void Parallaction_ns::_c_onMouse(void *parm) {
+ _engineFlags &= ~kEngineBlockInput;
_input->setMouseState(MOUSE_ENABLED_SHOW);
}
@@ -444,6 +446,7 @@
_soundManI->playMusic();
}
+ _engineFlags |= kEngineBlockInput;
_input->setMouseState(MOUSE_DISABLED);
_intro = true;
}
Modified: scummvm/branches/branch-1-1-0/engines/parallaction/gui_ns.cpp
===================================================================
--- scummvm/branches/branch-1-1-0/engines/parallaction/gui_ns.cpp 2010-04-02 12:51:42 UTC (rev 48464)
+++ scummvm/branches/branch-1-1-0/engines/parallaction/gui_ns.cpp 2010-04-02 12:55:32 UTC (rev 48465)
@@ -704,6 +704,7 @@
}
_vm->_gfx->freeLabels();
+ _engineFlags &= ~kEngineBlockInput;
return _helper->getState("selectcharacter");
}
Modified: scummvm/branches/branch-1-1-0/engines/parallaction/input.cpp
===================================================================
--- scummvm/branches/branch-1-1-0/engines/parallaction/input.cpp 2010-04-02 12:51:42 UTC (rev 48464)
+++ scummvm/branches/branch-1-1-0/engines/parallaction/input.cpp 2010-04-02 12:55:32 UTC (rev 48465)
@@ -190,11 +190,13 @@
int event = kEvNone;
if (!isMouseEnabled() ||
+ (_engineFlags & kEngineBlockInput) ||
(_engineFlags & kEngineWalking) ||
(_engineFlags & kEngineChangeLocation)) {
- debugC(3, kDebugInput, "updateGameInput: input flags (mouse: %i, walking: %i, changeloc: %i)",
+ debugC(3, kDebugInput, "updateGameInput: input flags (mouse: %i, block: %i, walking: %i, changeloc: %i)",
isMouseEnabled(),
+ (_engineFlags & kEngineBlockInput) == 0,
(_engineFlags & kEngineWalking) == 0,
(_engineFlags & kEngineChangeLocation) == 0
);
Modified: scummvm/branches/branch-1-1-0/engines/parallaction/parallaction.h
===================================================================
--- scummvm/branches/branch-1-1-0/engines/parallaction/parallaction.h 2010-04-02 12:51:42 UTC (rev 48464)
+++ scummvm/branches/branch-1-1-0/engines/parallaction/parallaction.h 2010-04-02 12:55:32 UTC (rev 48465)
@@ -79,6 +79,7 @@
kEnginePauseJobs = (1 << 1),
kEngineWalking = (1 << 3),
kEngineChangeLocation = (1 << 4),
+ kEngineBlockInput = (1 << 5),
kEngineDragging = (1 << 6),
kEngineTransformedDonna = (1 << 7),
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