mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-03 18:06:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

more guarding against null stag info

Browse Source
This commit is contained in:
gymnast86
2026-05-21 05:51:33 -07:00
parent 1e3f097e63
commit 650b56beee
1 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_com_inf_game.cpp
+25
View File
@@ -2082,7 +2082,12 @@ static void dummy1() {
}
BOOL dComIfGs_isStageTbox(int i_stageNo, int i_no) {
#if TARGET_PC
// Avoid trying to get the save table if stag info is NULL
if (dComIfGp_getStageStagInfo() && i_stageNo == dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo())) {
#else
if (i_stageNo == dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo())) {
#endif
return dComIfGs_isTbox(i_no);
} else {
return dComIfGs_isSaveTbox(i_stageNo, i_no);
@@ -2111,7 +2116,12 @@ void dComIfGs_offStageSwitch(int i_stageNo, int i_no) {
}
BOOL dComIfGs_isStageSwitch(int i_stageNo, int i_no) {
#if TARGET_PC
// Avoid trying to get the save table if stag info is NULL
if (dComIfGp_getStageStagInfo() && i_stageNo == dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo())) {
#else
if (i_stageNo == dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo())) {
#endif
return dComIfGs_isSwitch(i_no, -1);
} else {
return dComIfGs_isSaveSwitch(i_stageNo, i_no);
@@ -2140,7 +2150,12 @@ void dComIfGs_offDungeonItemMap(int i_stageNo) {
}
s32 dComIfGs_isDungeonItemMap(int i_stageNo) {
#if TARGET_PC
// Avoid trying to get the save table if stag info is NULL
if (dComIfGp_getStageStagInfo() && i_stageNo == dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo())) {
#else
if (i_stageNo == dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo())) {
#endif
return dComIfGs_isDungeonItemMap();
}
@@ -2169,7 +2184,12 @@ void dComIfGs_offDungeonItemCompass(int i_stageNo) {
}
s32 dComIfGs_isDungeonItemCompass(int i_stageNo) {
#if TARGET_PC
// Avoid trying to get the save table if stag info is NULL
if (dComIfGp_getStageStagInfo() && i_stageNo == dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo())) {
#else
if (i_stageNo == dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo())) {
#endif
return dComIfGs_isDungeonItemCompass();
}
@@ -2198,7 +2218,12 @@ void dComIfGs_offDungeonItemBossKey(int i_stageNo) {
}
s32 dComIfGs_isDungeonItemBossKey(int i_stageNo) {
#if TARGET_PC
// Avoid trying to get the save table if stag info is NULL
if (dComIfGp_getStageStagInfo() && i_stageNo == dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo())) {
#else
if (i_stageNo == dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo())) {
#endif
return dComIfGs_isDungeonItemBossKey();
}