libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 07:11:49 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

M4: ORIONBURGER: Fix Wilbur throwing Kibble at wood shavings

Browse Source 
This would crash in the demo and also had some repeating animation issues

The fix includes:
- skipping Wilbur's quote which is missing in the demo (using a new play series "PLAY10Demo").
   I can only test in demo, but I'm assuming the spoken quote exists in the full version.
- fix repeating the animation of throwing the kibble (this seems to have been a typing / copy-paste error)
- Removing the kibble from Wilbur's inventory after he throws it (this is an "original" bug since it's not removed in the demo).
- Waking up the Gerbils, after Wilbur throws the kibble at the wood shavings (this is the behavior in the demo).
This commit is contained in:
antoniou79 2024-02-20 15:33:23 +02:00 committed by Paul Gilbert
parent 01a2d2edab
commit 054fda8f7b
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
engines/m4/burger/rooms/section6/room604.cpp
View File

@ -125,12 +125,16 @@ const seriesPlayBreak Room604::PLAY9[] = {
PLAY_BREAK_END
};
const seriesPlayBreak Room604::PLAY10[] = {
const seriesPlayBreak Room604::PLAY10Demo[] = {
{ 0, 3, nullptr, 1, 0, -1, 2048, 0, nullptr, 0 },
{ 4, 14, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
{ 15, 23, "604_008", 1, 255, -1, 0, 0, nullptr, 0 },
{ 4, 14, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
{ 15, 23, "604_008", 1, 255, -1, 0, 0, nullptr, 0 },
{ 15, 23, nullptr, 1, 255, -1, 0, 0, nullptr, 0 },
{ 24, -1, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
PLAY_BREAK_END
};
const seriesPlayBreak Room604::PLAY10[] = {
{ 0, 3, nullptr, 1, 0, -1, 2048, 0, nullptr, 0 },
{ 4, 14, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
{ 15, 23, "604_008", 1, 255, -1, 0, 0, nullptr, 0 },
{ 24, -1, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
@ -422,7 +426,6 @@ void Room604::daemon() {
case 3:
ws_unhide_walker();
player_set_commands_allowed(true);
switch (_G(flags)[V242]) {
case 0:
wilbur_speech("604w001");
@ -507,9 +510,15 @@ void Room604::daemon() {
ws_hide_walker();
_G(wilbur_should) = 10001;
player_set_commands_allowed(false);
series_play_with_breaks(PLAY10, "604wi11", 0xa00, kCHANGE_WILBUR_ANIMATION, 3);
if (_G(executing) == INTERACTIVE_DEMO) {
series_play_with_breaks(PLAY10Demo, "604wi11", 0xa00, kCHANGE_WILBUR_ANIMATION, 3);
} else {
series_play_with_breaks(PLAY10, "604wi11", 0xa00, kCHANGE_WILBUR_ANIMATION, 3);
}
// Remove Kibble from inventory
kernel_trigger_dispatch_now(2);
if (_G(flags)[V274] == 0 && _G(flags)[kHampsterState] == 600) {
if (_G(flags)[V274] == 0 && _G(flags)[kHampsterState] == 6000) {
_G(flags)[kHampsterState] = 6006;
_G(flags)[V248] = 1;
term_message("The gerbils awaken");

1
engines/m4/burger/rooms/section6/room604.h
View File

@ -40,6 +40,7 @@ private:
static const seriesPlayBreak PLAY8[];
static const seriesPlayBreak PLAY9[];
static const seriesPlayBreak PLAY10[];
static const seriesPlayBreak PLAY10Demo[];
static const seriesPlayBreak PLAY11[];
static const seriesPlayBreak PLAY12[];
static int32 _state1;