remove "duplicated" inlines (#2099)

* fix f_op_actor_mng inlines

* fix f_pc inlines

* fix d_a_alink weak func signatures

* fix d_com_inf_game inlines

* fix some more inlines

* fix rest of player inlines

* m_Do / JSystem inlines fixed

* fix upstream changes
This commit is contained in:
TakaRikka
2024-03-19 04:31:53 -07:00
committed by GitHub
parent 38e0f8927a
commit 25d51079a3
347 changed files with 3968 additions and 3888 deletions
+2 -2
View File
@@ -770,13 +770,13 @@ void dGameover_c::saveClose_proc() {
dComIfGp_offPauseFlag();
// Reset Monkey lantern steal sequence flags if player hasn't regained lantern
if (!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[226])) {
if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[226])) {
dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[224]);
dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[225]);
}
// Reset Lantern and oil status back into inventory if gameover during monkey steal sequence
if (i_dComIfGs_isItemFirstBit(KANTERA) && dComIfGs_getItem(SLOT_1, true) == NO_ITEM) {
if (dComIfGs_isItemFirstBit(KANTERA) && dComIfGs_getItem(SLOT_1, true) == NO_ITEM) {
dComIfGs_setItem(SLOT_1, KANTERA);
dComIfGs_setOil(dMeter2Info_getOilGaugeBackUp());
}