libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-26 12:48:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup.

Browse Source 
svn-id: r41519
This commit is contained in:
Johannes Schickel 2009-06-14 14:24:28 +00:00
parent d0471f01db
commit 7c5d739ba7
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/kyra/gui.cpp
View File

@ -421,8 +421,9 @@ void MainMenu::updateAnimation() {
bool MainMenu::getInput() {
Common::Event event;
Common::EventManager *eventMan = _vm->getEventManager();
while (_system->getEventManager()->pollEvent(event)) {
while (eventMan->pollEvent(event)) {
switch (event.type) {
case Common::EVENT_LBUTTONUP:
return true;

2
engines/kyra/sprites.cpp
View File

@ -47,7 +47,7 @@ Sprites::Sprites(KyraEngine_LoK *vm, OSystem *system) {
_spriteDefStart = 0;
memset(_drawLayerTable, 0, sizeof(_drawLayerTable));
_sceneAnimatorBeaconFlag = 0;
system->getEventManager()->registerRandomSource(_rnd, "kyraSprites");
_vm->getEventManager()->registerRandomSource(_rnd, "kyraSprites");
}
Sprites::~Sprites() {

7
engines/kyra/vqa.cpp
View File

@ -638,6 +638,7 @@ void VQAMovie::play() {
}
_vm->_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_sound, _stream);
Common::EventManager *eventMan = _vm->getEventManager();
for (uint i = 0; i < _header.numFrames; i++) {
displayFrame(i);
@ -656,17 +657,17 @@ void VQAMovie::play() {
break;
Common::Event event;
Common::EventManager *eventMan = _system->getEventManager();
while (eventMan->pollEvent(event)) {
switch (event.type) {
case Common::EVENT_KEYDOWN:
if (event.kbd.ascii == 27)
if (event.kbd.keycode == Common::KEYCODE_ESCAPE)
return;
break;
case Common::EVENT_RTL:
case Common::EVENT_QUIT:
return;
default:
break;
}