fixed my fix - mouse cursor now moves again in new GUI
svn-id: r4550
This commit is contained in:
parent
d354176107
commit
272c391eb0
1 changed files with 2 additions and 4 deletions
|
@ -1263,10 +1263,8 @@ void Scumm::waitForTimer(int msec_delay) {
|
||||||
|
|
||||||
// if newgui is running, copy event to EventList, and let the GUI handle it itself
|
// if newgui is running, copy event to EventList, and let the GUI handle it itself
|
||||||
// we might consider this approach for ScummLoop as well, and clean up the current mess
|
// we might consider this approach for ScummLoop as well, and clean up the current mess
|
||||||
if (_newgui->isActive()) {
|
if (_newgui->isActive())
|
||||||
_newgui->handleEvent(event);
|
_newgui->handleEvent(event);
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch(event.event_code) {
|
switch(event.event_code) {
|
||||||
case OSystem::EVENT_KEYDOWN:
|
case OSystem::EVENT_KEYDOWN:
|
||||||
|
@ -1286,7 +1284,7 @@ void Scumm::waitForTimer(int msec_delay) {
|
||||||
g_debugger.attach(this);
|
g_debugger.attach(this);
|
||||||
else if (event.kbd.keycode=='s')
|
else if (event.kbd.keycode=='s')
|
||||||
resourceStats();
|
resourceStats();
|
||||||
} else
|
} else if (!_newgui->isActive())
|
||||||
_keyPressed = event.kbd.ascii; // Normal key press, pass on to the game.
|
_keyPressed = event.kbd.ascii; // Normal key press, pass on to the game.
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue