diff options
| author | Robert Göffringmann | 2003-12-28 23:24:03 +0000 |
|---|---|---|
| committer | Robert Göffringmann | 2003-12-28 23:24:03 +0000 |
| commit | e9766658b666dfe5065ccb5f27549f0719b16cda (patch) | |
| tree | 1083411aca1741dedc6d8269ac267d6c31e73e4f /sword1/logic.cpp | |
| parent | 2548df9cf8ae51a55a7959ca24741a9f8ceb8414 (diff) | |
| download | scummvm-rg350-e9766658b666dfe5065ccb5f27549f0719b16cda.tar.gz scummvm-rg350-e9766658b666dfe5065ccb5f27549f0719b16cda.tar.bz2 scummvm-rg350-e9766658b666dfe5065ccb5f27549f0719b16cda.zip | |
this fixes the remaining glitches
svn-id: r12004
Diffstat (limited to 'sword1/logic.cpp')
| -rw-r--r-- | sword1/logic.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sword1/logic.cpp b/sword1/logic.cpp index 7d8bd64602..43fcf4eb94 100644 --- a/sword1/logic.cpp +++ b/sword1/logic.cpp @@ -864,12 +864,11 @@ int SwordLogic::fnFadeDown(BsObject *cpt, int32 id, int32 speed, int32 d, int32 } int SwordLogic::fnFadeUp(BsObject *cpt, int32 id, int32 speed, int32 d, int32 e, int32 f, int32 z, int32 x) { - _scriptVars[NEW_PALETTE] = 1; + _screen->fadeUpPalette(); return SCRIPT_CONT; } int SwordLogic::fnCheckFade(BsObject *cpt, int32 id, int32 c, int32 d, int32 e, int32 f, int32 z, int32 x) { - _scriptVars[RETURN_VALUE] = (uint8)_screen->stillFading(); return SCRIPT_CONT; } @@ -901,7 +900,7 @@ int SwordLogic::fnSetPaletteToCut(BsObject *cpt, int32 id, int32 c, int32 d, int int SwordLogic::fnPlaySequence(BsObject *cpt, int32 id, int32 sequenceId, int32 d, int32 e, int32 f, int32 z, int32 x) { warning("fnPlaySequence(%d) called", sequenceId); - _scriptVars[NEW_PALETTE] = 1; + //_scriptVars[NEW_PALETTE] = 1; /* the logic usually calls fnFadeDown before playing the sequence, so we have to set NEW_PALETTE now to force a palette refresh */ return SCRIPT_CONT; |