[Scummvm-cvs-logs] SF.net SVN: scummvm: [26357] scummvm/trunk/engines
cyx at users.sourceforge.net
cyx at users.sourceforge.net
Sun Apr 1 19:36:14 CEST 2007
Revision: 26357
http://scummvm.svn.sourceforge.net/scummvm/?rev=26357&view=rev
Author: cyx
Date: 2007-04-01 10:36:13 -0700 (Sun, 01 Apr 2007)
Log Message:
-----------
added the instance of EventManager returned by OSystem::getEventManager as a member of the Engine base class. This allows to simply the code a bit and should more efficient too (ie. less virtual function chain calls, obj->getA()->getB()). Also updated several engines to make use of it.
Modified Paths:
--------------
scummvm/trunk/engines/agi/agi.cpp
scummvm/trunk/engines/agos/cursor.cpp
scummvm/trunk/engines/agos/event.cpp
scummvm/trunk/engines/engine.cpp
scummvm/trunk/engines/engine.h
scummvm/trunk/engines/kyra/gui.cpp
scummvm/trunk/engines/kyra/kyra.cpp
scummvm/trunk/engines/kyra/sequences_v1.cpp
scummvm/trunk/engines/kyra/text.cpp
scummvm/trunk/engines/saga/input.cpp
scummvm/trunk/engines/scumm/input.cpp
scummvm/trunk/engines/scumm/scumm.cpp
scummvm/trunk/engines/sky/sky.cpp
scummvm/trunk/engines/sword1/sword1.cpp
scummvm/trunk/engines/sword2/sword2.cpp
scummvm/trunk/engines/touche/touche.cpp
scummvm/trunk/engines/touche/touche.h
Modified: scummvm/trunk/engines/agi/agi.cpp
===================================================================
--- scummvm/trunk/engines/agi/agi.cpp 2007-04-01 17:13:45 UTC (rev 26356)
+++ scummvm/trunk/engines/agi/agi.cpp 2007-04-01 17:36:13 UTC (rev 26357)
@@ -61,8 +61,7 @@
Common::Event event;
int key = 0;
- Common::EventManager *eventMan = _system->getEventManager();
- while (eventMan->pollEvent(event)) {
+ while (_eventMan->pollEvent(event)) {
switch (event.type) {
case Common::EVENT_QUIT:
_gfx->deinitVideo();
Modified: scummvm/trunk/engines/agos/cursor.cpp
===================================================================
--- scummvm/trunk/engines/agos/cursor.cpp 2007-04-01 17:13:45 UTC (rev 26356)
+++ scummvm/trunk/engines/agos/cursor.cpp 2007-04-01 17:36:13 UTC (rev 26357)
@@ -309,7 +309,7 @@
}
CursorMan.showMouse(true);
- _mouse = _system->getEventManager()->getMousePos();
+ _mouse = _eventMan->getMousePos();
if (_defaultVerb) {
uint id = 101;
Modified: scummvm/trunk/engines/agos/event.cpp
===================================================================
--- scummvm/trunk/engines/agos/event.cpp 2007-04-01 17:13:45 UTC (rev 26356)
+++ scummvm/trunk/engines/agos/event.cpp 2007-04-01 17:36:13 UTC (rev 26357)
@@ -332,8 +332,7 @@
_inCallBack = false;
}
- Common::EventManager *eventMan = _system->getEventManager();
- while (eventMan->pollEvent(event)) {
+ while (_eventMan->pollEvent(event)) {
switch (event.type) {
case Common::EVENT_KEYDOWN:
if (event.kbd.keycode >= '0' && event.kbd.keycode <='9'
Modified: scummvm/trunk/engines/engine.cpp
===================================================================
--- scummvm/trunk/engines/engine.cpp 2007-04-01 17:13:45 UTC (rev 26356)
+++ scummvm/trunk/engines/engine.cpp 2007-04-01 17:36:13 UTC (rev 26357)
@@ -48,6 +48,7 @@
: _system(syst),
_mixer(_system->getMixer()),
_timer(_system->getTimerManager()),
+ _eventMan(_system->getEventManager()),
_saveFileMan(_system->getSavefileManager()),
_targetName(ConfMan.getActiveDomainName()),
_gameDataPath(ConfMan.get("path")) {
Modified: scummvm/trunk/engines/engine.h
===================================================================
--- scummvm/trunk/engines/engine.h 2007-04-01 17:13:45 UTC (rev 26356)
+++ scummvm/trunk/engines/engine.h 2007-04-01 17:36:13 UTC (rev 26357)
@@ -31,6 +31,7 @@
class Mixer;
}
namespace Common {
+ class EventManager;
class SaveFileManager;
class TimerManager;
}
@@ -45,6 +46,7 @@
Common::TimerManager * _timer;
protected:
+ Common::EventManager *_eventMan;
Common::SaveFileManager *_saveFileMan;
const Common::String _targetName; // target name for saves
Modified: scummvm/trunk/engines/kyra/gui.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui.cpp 2007-04-01 17:13:45 UTC (rev 26356)
+++ scummvm/trunk/engines/kyra/gui.cpp 2007-04-01 17:36:13 UTC (rev 26357)
@@ -811,8 +811,7 @@
uint32 now = _system->getMillis();
_mouseWheel = 0;
- Common::EventManager *eventMan = _system->getEventManager();
- while (eventMan->pollEvent(event)) {
+ while (_eventMan->pollEvent(event)) {
switch (event.type) {
case Common::EVENT_QUIT:
quitGame();
@@ -1487,8 +1486,7 @@
bool KyraEngine::gui_mainMenuGetInput() {
Common::Event event;
- Common::EventManager *eventMan = _system->getEventManager();
- while (eventMan->pollEvent(event)) {
+ while (_eventMan->pollEvent(event)) {
switch (event.type) {
case Common::EVENT_QUIT:
quitGame();
Modified: scummvm/trunk/engines/kyra/kyra.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra.cpp 2007-04-01 17:13:45 UTC (rev 26356)
+++ scummvm/trunk/engines/kyra/kyra.cpp 2007-04-01 17:36:13 UTC (rev 26357)
@@ -608,8 +608,7 @@
uint32 start = _system->getMillis();
do {
- Common::EventManager *eventMan = _system->getEventManager();
- while (eventMan->pollEvent(event)) {
+ while (_eventMan->pollEvent(event)) {
switch (event.type) {
case Common::EVENT_KEYDOWN:
if (event.kbd.keycode >= '1' && event.kbd.keycode <= '9' &&
@@ -690,7 +689,7 @@
}
Common::Point KyraEngine::getMousePos() const {
- Common::Point mouse = g_system->getEventManager()->getMousePos();
+ Common::Point mouse = _eventMan->getMousePos();
if (_flags.useHiResOverlay) {
mouse.x >>= 1;
mouse.y >>= 1;
@@ -702,8 +701,7 @@
bool finished = false;
Common::Event event;
while (!finished && !_quitFlag) {
- Common::EventManager *eventMan = _system->getEventManager();
- while (eventMan->pollEvent(event)) {
+ while (_eventMan->pollEvent(event)) {
switch (event.type) {
case Common::EVENT_KEYDOWN:
finished = true;
Modified: scummvm/trunk/engines/kyra/sequences_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_v1.cpp 2007-04-01 17:13:45 UTC (rev 26356)
+++ scummvm/trunk/engines/kyra/sequences_v1.cpp 2007-04-01 17:36:13 UTC (rev 26357)
@@ -1171,8 +1171,7 @@
_screen->updateScreen();
}
- Common::EventManager *eventMan = _system->getEventManager();
- while (eventMan->pollEvent(event)) {
+ while (_eventMan->pollEvent(event)) {
switch (event.type) {
case Common::EVENT_KEYDOWN:
finished = true;
Modified: scummvm/trunk/engines/kyra/text.cpp
===================================================================
--- scummvm/trunk/engines/kyra/text.cpp 2007-04-01 17:13:45 UTC (rev 26356)
+++ scummvm/trunk/engines/kyra/text.cpp 2007-04-01 17:36:13 UTC (rev 26357)
@@ -118,8 +118,7 @@
uint32 nextTime = loopStart + _tickLength;
while (_system->getMillis() < nextTime) {
- Common::EventManager *eventMan = _system->getEventManager();
- while (eventMan->pollEvent(event)) {
+ while (_eventMan->pollEvent(event)) {
switch (event.type) {
case Common::EVENT_KEYDOWN:
if (event.kbd.keycode == '.')
Modified: scummvm/trunk/engines/saga/input.cpp
===================================================================
--- scummvm/trunk/engines/saga/input.cpp 2007-04-01 17:13:45 UTC (rev 26356)
+++ scummvm/trunk/engines/saga/input.cpp 2007-04-01 17:36:13 UTC (rev 26357)
@@ -40,8 +40,7 @@
int SagaEngine::processInput() {
Common::Event event;
- Common::EventManager *eventMan = _system->getEventManager();
- while (eventMan->pollEvent(event)) {
+ while (_eventMan->pollEvent(event)) {
switch (event.type) {
case Common::EVENT_KEYDOWN:
if (event.kbd.flags == Common::KBD_CTRL) {
@@ -153,7 +152,7 @@
}
Point SagaEngine::mousePos() const {
- return _system->getEventManager()->getMousePos();
+ return _eventMan->getMousePos();
}
} // End of namespace Saga
Modified: scummvm/trunk/engines/scumm/input.cpp
===================================================================
--- scummvm/trunk/engines/scumm/input.cpp 2007-04-01 17:13:45 UTC (rev 26356)
+++ scummvm/trunk/engines/scumm/input.cpp 2007-04-01 17:36:13 UTC (rev 26357)
@@ -57,8 +57,7 @@
void ScummEngine::parseEvents() {
Common::Event event;
- Common::EventManager *eventMan = _system->getEventManager();
- while (eventMan->pollEvent(event)) {
+ while (_eventMan->pollEvent(event)) {
switch (event.type) {
case Common::EVENT_KEYDOWN:
Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp 2007-04-01 17:13:45 UTC (rev 26356)
+++ scummvm/trunk/engines/scumm/scumm.cpp 2007-04-01 17:36:13 UTC (rev 26357)
@@ -851,8 +851,7 @@
void ScummEngine_vCUPhe::parseEvents() {
Common::Event event;
- Common::EventManager *eventMan = _system->getEventManager();
- while (eventMan->pollEvent(event)) {
+ while (_eventMan->pollEvent(event)) {
switch (event.type) {
case Common::EVENT_QUIT:
_quit = true;
Modified: scummvm/trunk/engines/sky/sky.cpp
===================================================================
--- scummvm/trunk/engines/sky/sky.cpp 2007-04-01 17:13:45 UTC (rev 26356)
+++ scummvm/trunk/engines/sky/sky.cpp 2007-04-01 17:36:13 UTC (rev 26357)
@@ -511,7 +511,6 @@
void SkyEngine::delay(int32 amount) {
- Common::EventManager *eventMan = _system->getEventManager();
Common::Event event;
uint32 start = _system->getMillis();
@@ -521,7 +520,7 @@
amount = 0;
do {
- while (eventMan->pollEvent(event)) {
+ while (_eventMan->pollEvent(event)) {
switch (event.type) {
case Common::EVENT_KEYDOWN:
_keyFlags = event.kbd.flags;
Modified: scummvm/trunk/engines/sword1/sword1.cpp
===================================================================
--- scummvm/trunk/engines/sword1/sword1.cpp 2007-04-01 17:13:45 UTC (rev 26356)
+++ scummvm/trunk/engines/sword1/sword1.cpp 2007-04-01 17:36:13 UTC (rev 26357)
@@ -706,8 +706,7 @@
uint32 start = _system->getMillis();
do {
- Common::EventManager *eventMan = _system->getEventManager();
- while (eventMan->pollEvent(event)) {
+ while (_eventMan->pollEvent(event)) {
switch (event.type) {
case Common::EVENT_KEYDOWN:
// Make sure backspace works right (this fixes a small issue on OS X)
Modified: scummvm/trunk/engines/sword2/sword2.cpp
===================================================================
--- scummvm/trunk/engines/sword2/sword2.cpp 2007-04-01 17:13:45 UTC (rev 26356)
+++ scummvm/trunk/engines/sword2/sword2.cpp 2007-04-01 17:36:13 UTC (rev 26357)
@@ -534,8 +534,7 @@
void Sword2Engine::parseInputEvents() {
Common::Event event;
- Common::EventManager *eventMan = _system->getEventManager();
- while (eventMan->pollEvent(event)) {
+ while (_eventMan->pollEvent(event)) {
switch (event.type) {
case Common::EVENT_KEYDOWN:
if (event.kbd.flags == Common::KBD_CTRL) {
Modified: scummvm/trunk/engines/touche/touche.cpp
===================================================================
--- scummvm/trunk/engines/touche/touche.cpp 2007-04-01 17:13:45 UTC (rev 26356)
+++ scummvm/trunk/engines/touche/touche.cpp 2007-04-01 17:36:13 UTC (rev 26357)
@@ -237,10 +237,8 @@
ConfMan.flushToDisk();
}
-Common::Point ToucheEngine::getMousePos() {
- Common::EventManager *eventMan = _system->getEventManager();
-
- return eventMan->getMousePos();
+Common::Point ToucheEngine::getMousePos() const {
+ return _eventMan->getMousePos();
}
void ToucheEngine::mainLoop() {
Modified: scummvm/trunk/engines/touche/touche.h
===================================================================
--- scummvm/trunk/engines/touche/touche.h 2007-04-01 17:13:45 UTC (rev 26356)
+++ scummvm/trunk/engines/touche/touche.h 2007-04-01 17:36:13 UTC (rev 26357)
@@ -611,7 +611,7 @@
int displayQuitDialog();
void displayTextMode(int str);
- Common::Point getMousePos();
+ Common::Point getMousePos() const;
MidiPlayer *_midiPlayer;
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