fix version differences

This commit is contained in:
LagoLunatic
2024-03-08 21:51:15 -05:00
parent 443691603d
commit 3f892bfb64
3 changed files with 11 additions and 1 deletions
+6
View File
@@ -476,7 +476,9 @@ void daNpc_kam_c::npcAction(void* arg) {
speedF = 0.0f;
offHyoiKamome();
setNpcAction(&waitNpcAction, NULL);
#if VERSION != VERSION_JPN
mDoAud_zelAudio_c::getInterface()->field_0x0062 = 0;
#endif
}
(this->*mCurrNpcActionFunc)(arg);
@@ -912,7 +914,9 @@ BOOL daNpc_kam_c::checkCommandTalk() {
void daNpc_kam_c::returnLinkPlayer() {
changePlayer(dComIfGp_getLinkPlayer());
offHyoiKamome();
#if VERSION != VERSION_JPN
mDoAud_zelAudio_c::getInterface()->field_0x0062 = 0;
#endif
}
static daNpc_kam_c::EventActionInitFunc event_init_tbl[] = {
@@ -1039,7 +1043,9 @@ void daNpc_kam_c::initialDescendEvent(int evtStaffId) {
mTargetAngVelX = l_HIO.mHio1.mGlidingAngVelX;
mDoAud_seStart(JA_SE_HYOI_USE_DEMO, NULL, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
#if VERSION != VERSION_JPN
mDoAud_zelAudio_c::getInterface()->field_0x0062 = 1;
#endif
onNoBgCheck();
+4
View File
@@ -70,8 +70,10 @@ BOOL dScnMenu_Draw(menu_of_scene_class* i_this) {
}
JUTReport(40, 420, "十字右:進む 十字左:戻る");
JUTReport(200, 400, "曜日:%s", local_58[l_weekpat]);
#if VERSION == VERSION_PAL
static const char* language[] = {"ENGLISH", "GERMAN", "FRENCH", "SPANISH", "ITALIAN"};
JUTReport(40, 440, "%s", language[g_dComIfG_gameInfo.play.mGameLanguage]);
#endif
if (dComIfGs_isEventBit(0x2d01)) {
JUTReport(400, 420, "3コン(A):デモ23 ON");
} else {
@@ -155,7 +157,9 @@ s32 dScnMenu_Create(scene_class* i_scn) {
(cPhs__Handler)phase_2,
};
menu_of_scene_class* i_this = (menu_of_scene_class *)i_scn;
#if VERSION == VERSION_PAL
l_languageType = g_dComIfG_gameInfo.play.mGameLanguage;
#endif
return dComLbG_PhaseHandler(&i_this->mPhs, l_method, i_this);
}
+1 -1
View File
@@ -49,7 +49,7 @@ base_process_class* fpcFCtRq_Request(layer_class* i_layer, s16 i_procTypeID,
}
}
#if VERSION == VERSION_JPN
fpcCtRq_Delete(&request->mBase);
fpcCtRq_Delete(&request->base);
#else
fpcCtRq_Cancel(&request->base);
#endif