libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-12 03:56:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ICB: ELDORADO: fix regression in fn_request_speech, add commented out code to be enabled later

Browse Source
This commit is contained in:
Joost Peters 2022-08-05 18:24:40 +02:00
parent c001d5e35a
commit c7804e96a8
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
engines/icb/speech.cpp
View File

@ -131,15 +131,30 @@ mcodeFunctionReturnCodes _game_session::fn_request_speech(int32 &result, int32 *
g_oIconMenu->CloseDownIconMenu();
if ((g_oIconMenu->IsActive()) || (player.player_status == REMORA))
return IR_REPEAT;
// not started yet
S.state = __PENDING;
} else {
if ((g_oIconMenu->IsActive()) || (player.player_status == REMORA/*MAP*/))
return IR_REPEAT;
} else {
//TODO:
#if 0
if ((cur_id == player.Fetch_player_id()) && (player.player_status==MAP))
g_oMap.CloseDownMap();
if ((cur_id == player.Fetch_player_id()) && (g_oIconMenu.IsActive()))
g_oIconMenu.CloseDownIconMenu();
// if object is a mega, check what anim it has and turn its ambient anims off or on depending...
if (L->mega) {
if (L->cur_anim_type == __STAND) {
M->idleAnimsOn = TRUE8;
M->idlePhase = NEEDS_INIT;
} else
M->idleAnimsOn = FALSE8;
}
#endif
}
// not started yet
S.state = __PENDING;
// get the system now - in case another object tries to start a conversation
total_convs++; // to 1 ;)