Merge branch 'main' into 26-02-27-allocator-isolation

This commit is contained in:
PJB3005
2026-03-05 00:15:09 +01:00
5530 changed files with 252979 additions and 26830 deletions
+8 -5
View File
@@ -12,6 +12,7 @@
#include "d/d_meter2_info.h"
#include "d/d_pane_class_alpha.h"
#include <cstdio>
#include <cstring>
dFile_info_c::dFile_info_c(JKRArchive* i_archive, u8 param_1) {
mArchive = i_archive;
@@ -88,8 +89,9 @@ void dFile_info_c::screenSet() {
}
int dFile_info_c::setSaveData(dSv_save_c* i_savedata, BOOL i_validChksum, u8 i_dataNo) {
int result;
if (i_validChksum) {
char* player_name = i_savedata->getPlayer().getPlayerInfo().getLinkName();
char* player_name = i_savedata->getPlayer().getPlayerInfo().getPlayerName();
if (*player_name == 0) {
if (field_0x22 == 1 && i_dataNo == dComIfGs_getDataNum()) {
i_savedata->getPlayer().getPlayerStatusA().setLife(dComIfGs_getLife());
@@ -99,22 +101,23 @@ int dFile_info_c::setSaveData(dSv_save_c* i_savedata, BOOL i_validChksum, u8 i_d
strcpy(mSaveDate, "");
strcpy(mPlayTime, "");
dMeter2Info_getString(0x4D, mSaveStatus, NULL); // New Quest Log
return 2;
result = 2;
} else {
dMeter2Info_getString(0x4D, mSaveStatus, NULL); // New Quest Log
return 1;
result = 1;
}
} else {
setHeartCnt(i_savedata);
strcpy(mPlayerName, player_name);
setSaveDate(i_savedata);
setPlayTime(i_savedata);
return 0;
result = 0;
}
} else {
dMeter2Info_getString(0x51, mSaveStatus, NULL); // This Quest Log is Corrupted
return -1;
result = -1;
}
return result;
}
void dFile_info_c::setHeartCnt(dSv_save_c* i_savedata) {