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

ICB: ELDORADO: Fixed my earlier change in speech.cpp

Browse Source
This commit is contained in:
Paweł Kołodziejski 2022-08-05 18:49:46 +02:00
parent c7804e96a8
commit 95765feb55
No known key found for this signature in database
GPG Key ID: 0BDADC9E74440FF7
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
engines/icb/speech.cpp
View File

@ -97,11 +97,11 @@ mcodeFunctionReturnCodes _game_session::fn_get_speech_status(int32 &result, int3
if ((g_oIconMenu->IsActive()) || (player.player_status == REMORA))
result = 1;
if ((result) && (cur_id == player.Fetch_player_id()))
Tdebug("speech_check.txt", "get status");
}
if ((result) && (cur_id == player.Fetch_player_id()))
Tdebug("speech_check.txt", "get status");
return IR_CONT;
}
@ -126,32 +126,34 @@ mcodeFunctionReturnCodes _game_session::fn_request_speech(int32 &result, int32 *
if (g_icb->getGameType() == GType_ICB) {
if (player.player_status == REMORA)
return IR_REPEAT;
} else {
// TODO: enable later
#if 0
if (cur_id == player.Fetch_player_id() && (player.player_status == MAP)) {
g_oMap.CloseDownMap();
}
#endif
}
if ((cur_id == player.Fetch_player_id()) && (g_oIconMenu->IsActive()))
g_oIconMenu->CloseDownIconMenu();
if ((cur_id == player.Fetch_player_id()) && (g_oIconMenu->IsActive()))
g_oIconMenu->CloseDownIconMenu();
if (g_icb->getGameType() == GType_ICB) {
if ((g_oIconMenu->IsActive()) || (player.player_status == REMORA))
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
}
// TODO: enable later
#if 0
if (g_icb->getGameType() == GType_ELDORADO && 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;