libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-21 19:51:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MOHAWK: Minor CSTimeChar bugfixes.

Browse Source 
svn-id: r55446
This commit is contained in:
Alyssa Milburn 2011-01-22 21:22:29 +00:00
parent bfe0307300
commit bbfbb7e74a
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engines/mohawk/cstime.cpp
View File

@ -424,9 +424,8 @@ void MohawkEngine_CSTime::triggerEvent(CSTimeEvent &event) {
case kCSTimeEventCharStartFlapping:
{
CSTimeChar *chr = _case->getCurrScene()->getChar(event.param1);
if (!chr->_enabled) {
// FIXME
warning("chr not enabled in kCSTimeEventCharStartFlapping");
if (!chr->_unknown2) {
_case->getCurrScene()->_activeChar->_flappingState = 0;
break;
}

4
engines/mohawk/cstime_game.cpp
View File

@ -171,7 +171,7 @@ void CSTimeChar::setupRestPos() {
return;
if (!_restFeature) {
uint id = 0; // FIXME
uint id = _enabled ? 0 : 13;
uint32 flags = kFeatureSortStatic | kFeatureNewNoLoop | kFeatureNewDisableOnReset;
Feature *feature = _vm->getView()->installViewFeature(getChrBaseId() + id, flags, NULL);
// FIXME: fix priorities
@ -192,7 +192,7 @@ void CSTimeChar::removeChr() {
_vm->getView()->removeFeature(_talkFeature3, true);
if (_talkFeature1)
_vm->getView()->removeFeature(_talkFeature1, true);
if (_unknown1 > 1)
if (_talkFeature2) // original checks unknown1 > 1, but this is silly when e.g. _enabled is false
_vm->getView()->removeFeature(_talkFeature2, true);
}