From d574cfe272e80c08387333a56ffe9955130f276b Mon Sep 17 00:00:00 2001 From: Strangerke Date: Sat, 17 Sep 2011 17:27:05 +0200 Subject: CGE: Move _talk and _text to CGEEngine --- engines/cge/snail.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'engines/cge/snail.cpp') diff --git a/engines/cge/snail.cpp b/engines/cge/snail.cpp index 3c85f4abdb..d4993c9998 100644 --- a/engines/cge/snail.cpp +++ b/engines/cge/snail.cpp @@ -960,7 +960,7 @@ void Snail::runCom() { _textDelay = false; } } - if (_talk && snc->_com != kSnPause) + if (_vm->_talk && snc->_com != kSnPause) break; } @@ -970,7 +970,7 @@ void Snail::runCom() { break; case kSnPause : _timerExpiry = g_system->getMillis() + snc->_val * kSnailFrameDelay; - if (_talk) + if (_vm->_talk) _textDelay = true; break; case kSnWait: @@ -994,13 +994,13 @@ void Snail::runCom() { if (spr && _talkEnable) { if (spr == _vm->_hero && spr->seqTest(-1)) spr->step(kSeqHTalk); - _text->say(_text->getText(snc->_val), spr); + _vm->_text->say(_vm->_text->getText(snc->_val), spr); _vm->_sys->_funDel = kHeroFun0; } break; case kSnInf: if (_talkEnable) { - _vm->inf(_text->getText(snc->_val)); + _vm->inf(_vm->_text->getText(snc->_val)); _vm->_sys->_funDel = kHeroFun0; } break; @@ -1008,7 +1008,7 @@ void Snail::runCom() { if (spr && _talkEnable) { if (spr == _vm->_hero && spr->seqTest(-1)) spr->step(kSeqHTalk); - _text->sayTime(spr); + _vm->_text->sayTime(spr); } break; case kSnCave: -- cgit v1.2.3