aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sci.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2010-06-09 07:59:42 +0000
committerFilippos Karapetis2010-06-09 07:59:42 +0000
commit5cb311ee2c352372e8eb494933e2bc36ffd5c4f5 (patch)
tree541c69484c5cba4add34c2aec638f8897e18d560 /engines/sci/sci.cpp
parent10aeb33a4253b5df05f19a9bfabc3cc374db096c (diff)
downloadscummvm-rg350-5cb311ee2c352372e8eb494933e2bc36ffd5c4f5.tar.gz
scummvm-rg350-5cb311ee2c352372e8eb494933e2bc36ffd5c4f5.tar.bz2
scummvm-rg350-5cb311ee2c352372e8eb494933e2bc36ffd5c4f5.zip
Renamed the SciEvent class to EventManager, to separate it from the sciEvent structure, and removed it from the engine state
svn-id: r49534
Diffstat (limited to 'engines/sci/sci.cpp')
-rw-r--r--engines/sci/sci.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 888e72783c..b30665a59e 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -190,7 +190,7 @@ Common::Error SciEngine::run() {
_gamestate = new EngineState(segMan);
- _gamestate->_event = new SciEvent(_resMan);
+ _eventMan = new EventManager(_resMan);
if (script_init_engine(_gamestate))
return Common::kUnknownError;
@@ -203,7 +203,7 @@ Common::Error SciEngine::run() {
_gfxPaint16 = 0;
_gfxPorts = 0;
_gui = 0;
- _gui32 = new SciGui32(_gamestate->_segMan, _gamestate->_event, screen, palette, cache, cursor);
+ _gui32 = new SciGui32(_gamestate->_segMan, _eventMan, screen, palette, cache, cursor);
} else {
#endif
_gfxPorts = new GfxPorts(segMan, screen);
@@ -280,7 +280,7 @@ Common::Error SciEngine::run() {
delete _gfxPalette;
delete cursor;
delete _gfxScreen;
- delete _gamestate->_event;
+ delete _eventMan;
delete segMan;
delete _gamestate;