diff options
| author | Filippos Karapetis | 2009-10-16 23:29:00 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-10-16 23:29:00 +0000 |
| commit | e4c23834dd2972c75f6f698f9f55320c1784218f (patch) | |
| tree | e2c3c97b794b32ee5ee7890a4c07a0c73ce5cd4c /engines/sci/sci.cpp | |
| parent | 0479964ad7bc6f59d10638427f3f68406dd0e05c (diff) | |
| download | scummvm-rg350-e4c23834dd2972c75f6f698f9f55320c1784218f.tar.gz scummvm-rg350-e4c23834dd2972c75f6f698f9f55320c1784218f.tar.bz2 scummvm-rg350-e4c23834dd2972c75f6f698f9f55320c1784218f.zip | |
Moved sci_ffs() inside iterator.cpp, the only place where it's actually used, and removed tools.*. Also, removed all the unused includes to tools.h from several places
svn-id: r45176
Diffstat (limited to 'engines/sci/sci.cpp')
| -rw-r--r-- | engines/sci/sci.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index 3edf76d9eb..e7b06e5e57 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -132,8 +132,8 @@ Common::Error SciEngine::run() { return Common::kUnknownError; // Gui change - //_gamestate->_gui = new SciGui(_gamestate, screen, palette, cursor); // new - _gamestate->_gui = new SciGui32(_gamestate, screen, palette, cursor); // old + _gamestate->_gui = new SciGui(_gamestate, screen, palette, cursor); // new + //_gamestate->_gui = new SciGui32(_gamestate, screen, palette, cursor); // old if (game_init(_gamestate)) { /* Initialize */ warning("Game initialization failed: Aborting..."); |