diff options
| author | Torbjörn Andersson | 2005-04-24 12:13:03 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2005-04-24 12:13:03 +0000 |
| commit | 5553ef53f191ae190fcd6c35c430e61d665bae44 (patch) | |
| tree | 70b96175820eaad9060429330f29187d82201c66 /sword2/sword2.cpp | |
| parent | 6f29b92a5fa765ae3adb270035aeb104c2a9765d (diff) | |
| download | scummvm-rg350-5553ef53f191ae190fcd6c35c430e61d665bae44.tar.gz scummvm-rg350-5553ef53f191ae190fcd6c35c430e61d665bae44.tar.bz2 scummvm-rg350-5553ef53f191ae190fcd6c35c430e61d665bae44.zip | |
Moved conversation stuff from Logic to Mouse.
svn-id: r17787
Diffstat (limited to 'sword2/sword2.cpp')
| -rw-r--r-- | sword2/sword2.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sword2/sword2.cpp b/sword2/sword2.cpp index 2603f09bfb..20b75998a8 100644 --- a/sword2/sword2.cpp +++ b/sword2/sword2.cpp @@ -331,7 +331,7 @@ int Sword2Engine::go() { pauseGame(); break; case 'c': - if (!Logic::_scriptVars[DEMO] && !_logic->_choosing) + if (!Logic::_scriptVars[DEMO] && !_mouse->isChoosing()) _logic->fnPlayCredits(NULL); break; #ifdef SWORD2_DEBUG @@ -658,7 +658,7 @@ void Sword2Engine::unpauseGame() { _gamePaused = false; // If mouse is about or we're in a chooser menu - if (!_mouse->getMouseStatus() || _logic->_choosing) + if (!_mouse->getMouseStatus() || _mouse->isChoosing()) _mouse->setMouse(NORMAL_MOUSE_ID); } |