mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-29 03:33:48 +00:00
Code Issues Releases Wiki Activity

Addition to prev. commit: Fix this in a better way.

Browse source 
This also gets rid of a 1-frame delay in DSQ action handling.
Hope this doesn't cause any problems, as i'm not sure.
This commit is contained in:
fgenesis 2016-07-18 23:22:42 +02:00
parent 335b26d1e0
commit bff072039a
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Aquaria/DSQ.cpp
View file

@ -3835,10 +3835,11 @@ void DSQ::onUpdate(float dt)
} }
dsq->resetTimer(); dsq->resetTimer();
dsq->sound->resume(); dsq->sound->resume();
pollEvents(sec); // poll events again to reset internal state; else the ActionMapper::onUpdate() below triggers another ACTION_ESCAPE to re-pause the cutscene
} }
} }
Core::onUpdate(dt);
mod.update(dt); mod.update(dt);
@ -3869,9 +3870,6 @@ void DSQ::onUpdate(float dt)
subtitlePlayer.update(dt); subtitlePlayer.update(dt);
Core::onUpdate(dt);
demo.update(dt); demo.update(dt);
// HACK: not optimal // HACK: not optimal

6
BBGE/Core.cpp
View file

@ -680,15 +680,15 @@ bool Core::initInputLibrary()
void Core::onUpdate(float dt) void Core::onUpdate(float dt)
{ {
if (minimized) return; if (minimized) return;
ActionMapper::onUpdate(dt);
StateManager::onUpdate(dt);
core->mouse.lastPosition = core->mouse.position; core->mouse.lastPosition = core->mouse.position;
core->mouse.lastScrollWheel = core->mouse.scrollWheel; core->mouse.lastScrollWheel = core->mouse.scrollWheel;
pollEvents(dt); pollEvents(dt);
ActionMapper::onUpdate(dt);
StateManager::onUpdate(dt);
onMouseInput(); onMouseInput();
globalScale.update(dt); globalScale.update(dt);