diff options
author | johndoe123 | 2014-03-22 02:32:44 +0100 |
---|---|---|
committer | Eugene Sandulenko | 2018-07-20 06:43:33 +0000 |
commit | fc4266bcadaf7c01bf558ef78a9702254803ca77 (patch) | |
tree | 7ff02c71ff2da542dbdaacbf3eae754da44ecfa2 /engines/illusions/actor.cpp | |
parent | 812c7fc3a83f57b9ba181c47d3699155c16ab379 (diff) | |
download | scummvm-rg350-fc4266bcadaf7c01bf558ef78a9702254803ca77.tar.gz scummvm-rg350-fc4266bcadaf7c01bf558ef78a9702254803ca77.tar.bz2 scummvm-rg350-fc4266bcadaf7c01bf558ef78a9702254803ca77.zip |
ILLUSIONS: Add TalkThread
Diffstat (limited to 'engines/illusions/actor.cpp')
-rw-r--r-- | engines/illusions/actor.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/illusions/actor.cpp b/engines/illusions/actor.cpp index bcaf72bb54..933ebee18e 100644 --- a/engines/illusions/actor.cpp +++ b/engines/illusions/actor.cpp @@ -83,7 +83,7 @@ Actor::Actor(IllusionsEngine *vm) _notifyThreadId1 = 0; _notifyThreadId2 = 0; _surfaceTextFlag = 0; - _field30 = 0; + _entryTblPtr = 0; _seqCodeIp = 0; _sequenceId = 0; _seqCodeValue1 = 0; @@ -360,11 +360,11 @@ void Control::clearNotifyThreadId2() { if (_actor->_subobjects[i]) { Control *subControl = _vm->_dict->getObjectControl(_actor->_subobjects[i]); subControl->_actor->_flags &= ~0x80; - subControl->_actor->_field30 = 0; + subControl->_actor->_entryTblPtr = 0; subControl->_actor->_notifyThreadId2 = 0; } _actor->_flags &= ~0x80; - _actor->_field30 = 0; + _actor->_entryTblPtr = 0; _actor->_notifyThreadId2 = 0; } @@ -582,7 +582,7 @@ void Control::sequenceActor() { } -void Control::startSequenceActorIntern(uint32 sequenceId, int value, int value2, uint32 notifyThreadId) { +void Control::startSequenceActorIntern(uint32 sequenceId, int value, byte *entryTblPtr, uint32 notifyThreadId) { stopActor(); @@ -609,9 +609,9 @@ void Control::startSequenceActorIntern(uint32 sequenceId, int value, int value2, _actor->initSequenceStack(); stopSequenceActor(); _actor->_linkIndex2 = 0; - if (value2) { + if (entryTblPtr) { _actor->_flags |= 0x80; - _actor->_field30 = value2; + _actor->_entryTblPtr = entryTblPtr; _actor->_notifyThreadId1 = 0; _actor->_notifyThreadId2 = notifyThreadId; } |