libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-09 19:32:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HYPNO: fixed several corner cases in video sequences and improved debugging in boyz

Browse Source
This commit is contained in:
neuromancer 2022-06-14 12:51:20 +02:00
parent 412b155982
commit d393affc34
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
engines/hypno/boyz/arcade.cpp
View File

@ -219,6 +219,9 @@ void BoyzEngine::drawHealth() {
return;
float w = float(_health) / float(_maxHealth);
if (w <= 0 || _healthBar[_currentActor].w - 3 <= 0 || _healthBar[_currentActor].h / 2 <= 0)
return;
Common::Rect healthBarBox(0, 0, int((_healthBar[_currentActor].w - 3) * w), _healthBar[_currentActor].h / 2);
uint32 c = kHypnoColorWhiteOrBlue; // white
@ -358,6 +361,7 @@ bool BoyzEngine::checkTransition(ArcadeTransitions &transitions, ArcadeShooting
_background->decoder->forceSeekToFrame(at.jumpToTime);
_masks->decoder->forceSeekToFrame(at.jumpToTime);
} else if (at.loseLevel) {
debugC(1, kHypnoDebugArcade, "Losing level in transition at %d", _background->decoder->getCurFrame());
_health = 0;
} else
error ("Invalid transition at %d", ttime);
@ -611,24 +615,25 @@ bool BoyzEngine::shoot(const Common::Point &mousePos, ArcadeShooting *arc, bool
incFriendliesEncountered();
uint32 idx = _shoots[i].warningVideoIdx;
idx = idx == 0 ? 2 : idx;
Common::String filename = _warningVideosDay[idx];
_civiliansShoot++;
if (idx > 0) {
Common::String filename = _warningVideosDay[idx];
_civiliansShoot++;
_background->decoder->pauseVideo(true);
MVideo video(filename, Common::Point(0, 0), false, true, false);
disableCursor();
runIntro(video);
// Should be currentPalette?
loadPalette(arc->backgroundPalette);
_background->decoder->pauseVideo(false);
updateScreen(*_background);
drawScreen();
if (!_music.empty())
playSound(_music, 0, arc->musicRate); // restore music
hitPlayer();
_background->decoder->pauseVideo(true);
MVideo video(filename, Common::Point(0, 0), false, true, false);
disableCursor();
runIntro(video);
// Should be currentPalette?
loadPalette(arc->backgroundPalette);
_background->decoder->pauseVideo(false);
updateScreen(*_background);
drawScreen();
if (!_music.empty())
playSound(_music, 0, arc->musicRate); // restore music
hitPlayer();
}
debugC(1, kHypnoDebugArcade, "Jumping to %d", _shoots[i].explosionFrames[0].start - 3);
_background->decoder->forceSeekToFrame(_shoots[i].explosionFrames[0].start - 3);
_masks->decoder->forceSeekToFrame(_shoots[i].explosionFrames[0].start - 3);
@ -753,6 +758,8 @@ void BoyzEngine::missedTarget(Shoot *s, ArcadeShooting *arc) {
debugC(1, kHypnoDebugArcade, "Jumping to end of level");
_skipLevel = true;
} else if (s->missedAnimation == uint32(-1000)) {
if (_background->decoder->getCurFrame() > int(s->explosionFrames[0].start))
return; // Too late for this
_health = 0;
} else {
int missedAnimation = s->missedAnimation;