diff options
| author | johndoe123 | 2014-04-07 12:58:26 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-07-20 06:43:33 +0000 |
| commit | 3f15233f78a264e45ce74ecd2db9ed3119b1b654 (patch) | |
| tree | 821bda821f8b1d0813e271d682c5c42b59103c59 /engines/illusions/actor.cpp | |
| parent | 6ba5570de52344da602cf02fb83725b468e3d8c5 (diff) | |
| download | scummvm-rg350-3f15233f78a264e45ce74ecd2db9ed3119b1b654.tar.gz scummvm-rg350-3f15233f78a264e45ce74ecd2db9ed3119b1b654.tar.bz2 scummvm-rg350-3f15233f78a264e45ce74ecd2db9ed3119b1b654.zip | |
ILLUSIONS: Refactor code in preparation for the Duckman engine
Diffstat (limited to 'engines/illusions/actor.cpp')
| -rw-r--r-- | engines/illusions/actor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/illusions/actor.cpp b/engines/illusions/actor.cpp index 97c8dc0e61..1d9aae0c46 100644 --- a/engines/illusions/actor.cpp +++ b/engines/illusions/actor.cpp @@ -215,7 +215,7 @@ Control::Control(IllusionsEngine *vm) _position.y = 0; _actorTypeId = 0; _actor = 0; - _tag = _vm->_scriptMan->_activeScenes.getCurrentScene(); + _tag = _vm->getCurrentScene(); } Control::~Control() { @@ -574,7 +574,7 @@ void Control::startTalkActor(uint32 sequenceId, byte *entryTblPtr, uint32 thread subControl->_actor->_notifyThreadId2 = threadId; subControl->_actor->_entryTblPtr = entryTblPtr; subControl->_actor->_flags |= 0x80; - Thread *thread = _vm->_scriptMan->_threads->findThread(threadId); + Thread *thread = _vm->_threads->findThread(threadId); thread->sendMessage(kMsgClearSequenceId2, 0); } } @@ -680,7 +680,7 @@ void Control::stopSubSequence(int linkIndex) { _actor->_notifyThreadId2 = 0; } if (notifyThreadId2) { - Thread *talkThread = _vm->_scriptMan->_threads->findThread(notifyThreadId2); + Thread *talkThread = _vm->_threads->findThread(notifyThreadId2); talkThread->sendMessage(kMsgClearSequenceId2, 0); } } |