[Scummvm-cvs-logs] SF.net SVN: scummvm:[41519] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 41519
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41519&view=rev
Author:   lordhoto
Date:     2009-06-14 14:24:28 +0000 (Sun, 14 Jun 2009)

Log Message:
-----------
Cleanup.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/gui.cpp
    scummvm/trunk/engines/kyra/sprites.cpp
    scummvm/trunk/engines/kyra/vqa.cpp

Modified: scummvm/trunk/engines/kyra/gui.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui.cpp	2009-06-14 14:12:28 UTC (rev 41518)
+++ scummvm/trunk/engines/kyra/gui.cpp	2009-06-14 14:24:28 UTC (rev 41519)
@@ -421,8 +421,9 @@
 
 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;

Modified: scummvm/trunk/engines/kyra/sprites.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sprites.cpp	2009-06-14 14:12:28 UTC (rev 41518)
+++ scummvm/trunk/engines/kyra/sprites.cpp	2009-06-14 14:24:28 UTC (rev 41519)
@@ -47,7 +47,7 @@
 	_spriteDefStart = 0;
 	memset(_drawLayerTable, 0, sizeof(_drawLayerTable));
 	_sceneAnimatorBeaconFlag = 0;
-	system->getEventManager()->registerRandomSource(_rnd, "kyraSprites");
+	_vm->getEventManager()->registerRandomSource(_rnd, "kyraSprites");
 }
 
 Sprites::~Sprites() {

Modified: scummvm/trunk/engines/kyra/vqa.cpp
===================================================================
--- scummvm/trunk/engines/kyra/vqa.cpp	2009-06-14 14:12:28 UTC (rev 41518)
+++ scummvm/trunk/engines/kyra/vqa.cpp	2009-06-14 14:24:28 UTC (rev 41519)
@@ -638,6 +638,7 @@
 	}
 
 	_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 @@
 				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;
 				}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.