eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve loadsave.cc readability

This commit is contained in:
Alexander Batalov 2023-06-16 08:12:38 +03:00
parent cf98070cd0
commit fe035d8514
2 changed files with 128 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

253
src/loadsave.cc
View File

@ -61,6 +61,12 @@
namespace fallout { namespace fallout {
#define LOAD_SAVE_SIGNATURE "FALLOUT SAVE FILE"
#define LOAD_SAVE_DESCRIPTION_LENGTH 30
#define LOAD_SAVE_HANDLER_COUNT 27
#define LSGAME_MSG_NAME "LSGAME.MSG"
#define LS_WINDOW_WIDTH 640 #define LS_WINDOW_WIDTH 640
#define LS_WINDOW_HEIGHT 480 #define LS_WINDOW_HEIGHT 480
@ -83,8 +89,8 @@ namespace fallout {
#define ITEMS_DIR_NAME "items" #define ITEMS_DIR_NAME "items"
#define PROTO_FILE_EXT "pro" #define PROTO_FILE_EXT "pro"
#define LOAD_SAVE_DESCRIPTION_LENGTH (30) typedef int LoadGameHandler(File* stream);
#define LOAD_SAVE_HANDLER_COUNT (27) typedef int SaveGameHandler(File* stream);
typedef enum LoadSaveWindowType { typedef enum LoadSaveWindowType {
LOAD_SAVE_WINDOW_TYPE_SAVE_GAME, LOAD_SAVE_WINDOW_TYPE_SAVE_GAME,
@ -107,33 +113,28 @@ typedef enum LoadSaveScrollDirection {
LOAD_SAVE_SCROLL_DIRECTION_DOWN, LOAD_SAVE_SCROLL_DIRECTION_DOWN,
} LoadSaveScrollDirection; } LoadSaveScrollDirection;
typedef int LoadGameHandler(File* stream); typedef struct LoadSaveSlotData {
typedef int SaveGameHandler(File* stream); char signature[24];
short versionMinor;
#define LSGAME_MSG_NAME ("LSGAME.MSG") short versionMajor;
typedef struct STRUCT_613D30 {
char field_0[24];
short field_18;
short field_1A;
// TODO: The type is probably char, but it's read with the same function as // TODO: The type is probably char, but it's read with the same function as
// reading unsigned chars, which in turn probably result of collapsing // reading unsigned chars, which in turn probably result of collapsing
// reading functions. // reading functions.
unsigned char field_1C; unsigned char versionRelease;
char character_name[32]; char characterName[32];
char description[LOAD_SAVE_DESCRIPTION_LENGTH]; char description[LOAD_SAVE_DESCRIPTION_LENGTH];
short field_5C; short fileMonth;
short field_5E; short fileDay;
short field_60; short fileYear;
int field_64; int fileTime;
short field_68; short gameMonth;
short field_6A; short gameDay;
short field_6C; short gameYear;
int field_70; int gameTime;
short field_74; short elevation;
short field_76; short map;
char file_name[16]; char fileName[16];
} STRUCT_613D30; } LoadSaveSlotData;
typedef enum LoadSaveFrm { typedef enum LoadSaveFrm {
LOAD_SAVE_FRM_BACKGROUND, LOAD_SAVE_FRM_BACKGROUND,
@ -156,10 +157,10 @@ static int lsgLoadGameInSlot(int slot);
static int lsgSaveHeaderInSlot(int slot); static int lsgSaveHeaderInSlot(int slot);
static int lsgLoadHeaderInSlot(int slot); static int lsgLoadHeaderInSlot(int slot);
static int _GetSlotList(); static int _GetSlotList();
static void _ShowSlotList(int a1); static void _ShowSlotList(int windowType);
static void _DrawInfoBox(int a1); static void _DrawInfoBox(int slot);
static int _LoadTumbSlot(int a1); static int _LoadTumbSlot(int slot);
static int _GetComment(int a1); static int _GetComment(int slot);
static int _get_input_str2(int win, int doneKeyCode, int cancelKeyCode, char* description, int maxLength, int x, int y, int textColor, int backgroundColor, int flags); static int _get_input_str2(int win, int doneKeyCode, int cancelKeyCode, char* description, int maxLength, int x, int y, int textColor, int backgroundColor, int flags);
static int _DummyFunc(File* stream); static int _DummyFunc(File* stream);
static int _PrepLoad(File* stream); static int _PrepLoad(File* stream);
@ -167,8 +168,8 @@ static int _EndLoad(File* stream);
static int _GameMap2Slot(File* stream); static int _GameMap2Slot(File* stream);
static int _SlotMap2Game(File* stream); static int _SlotMap2Game(File* stream);
static int _mygets(char* dest, File* stream); static int _mygets(char* dest, File* stream);
static int _copy_file(const char* a1, const char* a2); static int _copy_file(const char* existingFileName, const char* newFileName);
static int _MapDirErase(const char* path, const char* a2); static int _MapDirErase(const char* path, const char* extension);
static int _SaveBackup(); static int _SaveBackup();
static int _RestoreSave(); static int _RestoreSave();
static int _LoadObjDudeCid(File* stream); static int _LoadObjDudeCid(File* stream);
@ -201,7 +202,7 @@ static bool gLoadSaveWindowIsoWasEnabled = false;
static int _map_backup_count = -1; static int _map_backup_count = -1;
// 0x5193C8 // 0x5193C8
static int _automap_db_flag = 0; static bool _automap_db_flag = false;
// 0x5193CC // 0x5193CC
static const char* _patches = NULL; static const char* _patches = NULL;
@ -269,7 +270,7 @@ static LoadGameHandler* _master_load_list[LOAD_SAVE_HANDLER_COUNT] = {
}; };
// 0x5194C4 // 0x5194C4
static int _loadingGame = 0; static bool _loadingGame = false;
// lsgame.msg // lsgame.msg
// //
@ -277,7 +278,7 @@ static int _loadingGame = 0;
static MessageList gLoadSaveMessageList; static MessageList gLoadSaveMessageList;
// 0x613D30 // 0x613D30
static STRUCT_613D30 _LSData[10]; static LoadSaveSlotData _LSData[10];
// 0x614280 // 0x614280
static int _LSstatus[10]; static int _LSstatus[10];
@ -493,7 +494,7 @@ int lsgSaveGame(int mode)
break; break;
} }
_ShowSlotList(0); _ShowSlotList(LOAD_SAVE_WINDOW_TYPE_SAVE_GAME);
_DrawInfoBox(_slot_cursor); _DrawInfoBox(_slot_cursor);
windowRefresh(gLoadSaveWindow); windowRefresh(gLoadSaveWindow);
@ -998,7 +999,7 @@ int lsgLoadGame(int mode)
break; break;
} }
_ShowSlotList(2); _ShowSlotList(LOAD_SAVE_WINDOW_TYPE_LOAD_GAME);
_DrawInfoBox(_slot_cursor); _DrawInfoBox(_slot_cursor);
windowRefresh(gLoadSaveWindow); windowRefresh(gLoadSaveWindow);
renderPresent(); renderPresent();
@ -1169,7 +1170,7 @@ int lsgLoadGame(int mode)
break; break;
} }
_ShowSlotList(2); _ShowSlotList(LOAD_SAVE_WINDOW_TYPE_LOAD_GAME);
_DrawInfoBox(_slot_cursor); _DrawInfoBox(_slot_cursor);
windowRefresh(gLoadSaveWindow); windowRefresh(gLoadSaveWindow);
} }
@ -1216,7 +1217,7 @@ int lsgLoadGame(int mode)
} }
_DrawInfoBox(_slot_cursor); _DrawInfoBox(_slot_cursor);
_ShowSlotList(2); _ShowSlotList(LOAD_SAVE_WINDOW_TYPE_LOAD_GAME);
} }
windowRefresh(gLoadSaveWindow); windowRefresh(gLoadSaveWindow);
@ -1692,7 +1693,7 @@ static int lsgPerformSaveGame()
} }
// 0x47DC60 // 0x47DC60
int _isLoadingGame() bool _isLoadingGame()
{ {
return _loadingGame; return _loadingGame;
} }
@ -1700,7 +1701,7 @@ int _isLoadingGame()
// 0x47DC68 // 0x47DC68
static int lsgLoadGameInSlot(int slot) static int lsgLoadGameInSlot(int slot)
{ {
_loadingGame = 1; _loadingGame = true;
if (isInCombat()) { if (isInCombat()) {
interfaceBarEndButtonsHide(false); interfaceBarEndButtonsHide(false);
@ -1711,13 +1712,13 @@ static int lsgLoadGameInSlot(int slot)
snprintf(_gmpath, sizeof(_gmpath), "%s\\%s%.2d\\", "SAVEGAME", "SLOT", _slot_cursor + 1); snprintf(_gmpath, sizeof(_gmpath), "%s\\%s%.2d\\", "SAVEGAME", "SLOT", _slot_cursor + 1);
strcat(_gmpath, "SAVE.DAT"); strcat(_gmpath, "SAVE.DAT");
STRUCT_613D30* ptr = &(_LSData[slot]); LoadSaveSlotData* ptr = &(_LSData[slot]);
debugPrint("\nLOADSAVE: Load name: %s\n", ptr->description); debugPrint("\nLOADSAVE: Load name: %s\n", ptr->description);
_flptr = fileOpen(_gmpath, "rb"); _flptr = fileOpen(_gmpath, "rb");
if (_flptr == NULL) { if (_flptr == NULL) {
debugPrint("\nLOADSAVE: ** Error opening load game file for reading! **\n"); debugPrint("\nLOADSAVE: ** Error opening load game file for reading! **\n");
_loadingGame = 0; _loadingGame = false;
return -1; return -1;
} }
@ -1726,7 +1727,7 @@ static int lsgLoadGameInSlot(int slot)
debugPrint("\nLOADSAVE: ** Error reading save game header! **\n"); debugPrint("\nLOADSAVE: ** Error reading save game header! **\n");
fileClose(_flptr); fileClose(_flptr);
gameReset(); gameReset();
_loadingGame = 0; _loadingGame = false;
return -1; return -1;
} }
@ -1741,7 +1742,7 @@ static int lsgLoadGameInSlot(int slot)
debugPrint("LOADSAVE: Load function #%d data size read: %d bytes.\n", index, fileTell(_flptr) - pos); debugPrint("LOADSAVE: Load function #%d data size read: %d bytes.\n", index, fileTell(_flptr) - pos);
fileClose(_flptr); fileClose(_flptr);
gameReset(); gameReset();
_loadingGame = 0; _loadingGame = false;
return -1; return -1;
} }
@ -1781,7 +1782,7 @@ static int lsgLoadGameInSlot(int slot)
debugPrint("\nError: Couldn't find LoadSave Message!"); debugPrint("\nError: Couldn't find LoadSave Message!");
} }
_loadingGame = 0; _loadingGame = false;
// SFALL: Start global scripts. // SFALL: Start global scripts.
sfall_gl_scr_exec_start_proc(); sfall_gl_scr_exec_start_proc();
@ -1794,10 +1795,10 @@ static int lsgSaveHeaderInSlot(int slot)
{ {
_ls_error_code = 4; _ls_error_code = 4;
STRUCT_613D30* ptr = &(_LSData[slot]); LoadSaveSlotData* ptr = &(_LSData[slot]);
strncpy(ptr->field_0, "FALLOUT SAVE FILE", 24); strncpy(ptr->signature, LOAD_SAVE_SIGNATURE, 24);
if (fileWrite(ptr->field_0, 1, 24, _flptr) == -1) { if (fileWrite(ptr->signature, 1, 24, _flptr) == -1) {
return -1; return -1;
} }
@ -1805,22 +1806,22 @@ static int lsgSaveHeaderInSlot(int slot)
temp[0] = VERSION_MAJOR; temp[0] = VERSION_MAJOR;
temp[1] = VERSION_MINOR; temp[1] = VERSION_MINOR;
ptr->field_18 = temp[0]; ptr->versionMinor = temp[0];
ptr->field_1A = temp[1]; ptr->versionMajor = temp[1];
if (fileWriteInt16List(_flptr, temp, 2) == -1) { if (fileWriteInt16List(_flptr, temp, 2) == -1) {
return -1; return -1;
} }
ptr->field_1C = VERSION_RELEASE; ptr->versionRelease = VERSION_RELEASE;
if (fileWriteUInt8(_flptr, VERSION_RELEASE) == -1) { if (fileWriteUInt8(_flptr, VERSION_RELEASE) == -1) {
return -1; return -1;
} }
char* characterName = critterGetName(gDude); char* characterName = critterGetName(gDude);
strncpy(ptr->character_name, characterName, 32); strncpy(ptr->characterName, characterName, 32);
if (fileWrite(ptr->character_name, 32, 1, _flptr) != 1) { if (fileWrite(ptr->characterName, 32, 1, _flptr) != 1) {
return -1; return -1;
} }
@ -1835,16 +1836,16 @@ static int lsgSaveHeaderInSlot(int slot)
temp[1] = local->tm_mon + 1; temp[1] = local->tm_mon + 1;
temp[2] = local->tm_year + 1900; temp[2] = local->tm_year + 1900;
ptr->field_5E = temp[0]; ptr->fileDay = temp[0];
ptr->field_5C = temp[1]; ptr->fileMonth = temp[1];
ptr->field_60 = temp[2]; ptr->fileYear = temp[2];
ptr->field_64 = local->tm_hour + local->tm_min; ptr->fileTime = local->tm_hour + local->tm_min;
if (fileWriteInt16List(_flptr, temp, 3) == -1) { if (fileWriteInt16List(_flptr, temp, 3) == -1) {
return -1; return -1;
} }
if (_db_fwriteLong(_flptr, ptr->field_64) == -1) { if (_db_fwriteLong(_flptr, ptr->fileTime) == -1) {
return -1; return -1;
} }
@ -1856,23 +1857,23 @@ static int lsgSaveHeaderInSlot(int slot)
temp[0] = month; temp[0] = month;
temp[1] = day; temp[1] = day;
temp[2] = year; temp[2] = year;
ptr->field_70 = gameTimeGetTime(); ptr->gameTime = gameTimeGetTime();
if (fileWriteInt16List(_flptr, temp, 3) == -1) { if (fileWriteInt16List(_flptr, temp, 3) == -1) {
return -1; return -1;
} }
if (_db_fwriteLong(_flptr, ptr->field_70) == -1) { if (_db_fwriteLong(_flptr, ptr->gameTime) == -1) {
return -1; return -1;
} }
ptr->field_74 = gElevation; ptr->elevation = gElevation;
if (fileWriteInt16(_flptr, ptr->field_74) == -1) { if (fileWriteInt16(_flptr, ptr->elevation) == -1) {
return -1; return -1;
} }
ptr->field_76 = mapGetCurrentMap(); ptr->map = mapGetCurrentMap();
if (fileWriteInt16(_flptr, ptr->field_76) == -1) { if (fileWriteInt16(_flptr, ptr->map) == -1) {
return -1; return -1;
} }
@ -1881,8 +1882,8 @@ static int lsgSaveHeaderInSlot(int slot)
// NOTE: Uppercased from "sav". // NOTE: Uppercased from "sav".
char* v1 = _strmfe(_str, mapName, "SAV"); char* v1 = _strmfe(_str, mapName, "SAV");
strncpy(ptr->file_name, v1, 16); strncpy(ptr->fileName, v1, 16);
if (fileWrite(ptr->file_name, 16, 1, _flptr) != 1) { if (fileWrite(ptr->fileName, 16, 1, _flptr) != 1) {
return -1; return -1;
} }
@ -1905,13 +1906,13 @@ static int lsgLoadHeaderInSlot(int slot)
{ {
_ls_error_code = 3; _ls_error_code = 3;
STRUCT_613D30* ptr = &(_LSData[slot]); LoadSaveSlotData* ptr = &(_LSData[slot]);
if (fileRead(ptr->field_0, 1, 24, _flptr) != 24) { if (fileRead(ptr->signature, 1, 24, _flptr) != 24) {
return -1; return -1;
} }
if (strncmp(ptr->field_0, "FALLOUT SAVE FILE", 18) != 0) { if (strncmp(ptr->signature, LOAD_SAVE_SIGNATURE, 18) != 0) {
debugPrint("\nLOADSAVE: ** Invalid save file on load! **\n"); debugPrint("\nLOADSAVE: ** Invalid save file on load! **\n");
_ls_error_code = 2; _ls_error_code = 2;
return -1; return -1;
@ -1922,20 +1923,20 @@ static int lsgLoadHeaderInSlot(int slot)
return -1; return -1;
} }
ptr->field_18 = v8[0]; ptr->versionMinor = v8[0];
ptr->field_1A = v8[1]; ptr->versionMajor = v8[1];
if (fileReadUInt8(_flptr, &(ptr->field_1C)) == -1) { if (fileReadUInt8(_flptr, &(ptr->versionRelease)) == -1) {
return -1; return -1;
} }
if (ptr->field_18 != 1 || ptr->field_1A != 2 || ptr->field_1C != 'R') { if (ptr->versionMinor != 1 || ptr->versionMajor != 2 || ptr->versionRelease != 'R') {
debugPrint("\nLOADSAVE: Load slot #%d Version: %d.%d%c\n", slot, ptr->field_18, ptr->field_1A, ptr->field_1C); debugPrint("\nLOADSAVE: Load slot #%d Version: %d.%d%c\n", slot, ptr->versionMinor, ptr->versionMajor, ptr->versionRelease);
_ls_error_code = 1; _ls_error_code = 1;
return -1; return -1;
} }
if (fileRead(ptr->character_name, 32, 1, _flptr) != 1) { if (fileRead(ptr->characterName, 32, 1, _flptr) != 1) {
return -1; return -1;
} }
@ -1947,11 +1948,11 @@ static int lsgLoadHeaderInSlot(int slot)
return -1; return -1;
} }
ptr->field_5C = v8[0]; ptr->fileMonth = v8[0];
ptr->field_5E = v8[1]; ptr->fileDay = v8[1];
ptr->field_60 = v8[2]; ptr->fileYear = v8[2];
if (_db_freadInt(_flptr, &(ptr->field_64)) == -1) { if (_db_freadInt(_flptr, &(ptr->fileTime)) == -1) {
return -1; return -1;
} }
@ -1959,23 +1960,23 @@ static int lsgLoadHeaderInSlot(int slot)
return -1; return -1;
} }
ptr->field_68 = v8[0]; ptr->gameMonth = v8[0];
ptr->field_6A = v8[1]; ptr->gameDay = v8[1];
ptr->field_6C = v8[2]; ptr->gameYear = v8[2];
if (_db_freadInt(_flptr, &(ptr->field_70)) == -1) { if (_db_freadInt(_flptr, &(ptr->gameTime)) == -1) {
return -1; return -1;
} }
if (fileReadInt16(_flptr, &(ptr->field_74)) == -1) { if (fileReadInt16(_flptr, &(ptr->elevation)) == -1) {
return -1; return -1;
} }
if (fileReadInt16(_flptr, &(ptr->field_76)) == -1) { if (fileReadInt16(_flptr, &(ptr->map)) == -1) {
return -1; return -1;
} }
if (fileRead(ptr->file_name, 1, 16, _flptr) != 16) { if (fileRead(ptr->fileName, 1, 16, _flptr) != 16) {
return -1; return -1;
} }
@ -2029,7 +2030,7 @@ static int _GetSlotList()
} }
// 0x47E6D8 // 0x47E6D8
static void _ShowSlotList(int a1) static void _ShowSlotList(int windowType)
{ {
bufferFill(gLoadSaveWindowBuffer + LS_WINDOW_WIDTH * 87 + 55, 230, 353, LS_WINDOW_WIDTH, gLoadSaveWindowBuffer[LS_WINDOW_WIDTH * 86 + 55] & 0xFF); bufferFill(gLoadSaveWindowBuffer + LS_WINDOW_WIDTH * 87 + 55, 230, 353, LS_WINDOW_WIDTH, gLoadSaveWindowBuffer[LS_WINDOW_WIDTH * 86 + 55] & 0xFF);
@ -2037,7 +2038,7 @@ static void _ShowSlotList(int a1)
for (int index = 0; index < 10; index += 1) { for (int index = 0; index < 10; index += 1) {
int color = index == _slot_cursor ? _colorTable[32747] : _colorTable[992]; int color = index == _slot_cursor ? _colorTable[32747] : _colorTable[992];
const char* text = getmsg(&gLoadSaveMessageList, &gLoadSaveMessageListItem, a1 != 0 ? 110 : 109); const char* text = getmsg(&gLoadSaveMessageList, &gLoadSaveMessageListItem, windowType != 0 ? 110 : 109);
snprintf(_str, sizeof(_str), "[ %s %.2d: ]", text, index + 1); snprintf(_str, sizeof(_str), "[ %s %.2d: ]", text, index + 1);
fontDrawText(gLoadSaveWindowBuffer + LS_WINDOW_WIDTH * y + 55, _str, LS_WINDOW_WIDTH, LS_WINDOW_WIDTH, color); fontDrawText(gLoadSaveWindowBuffer + LS_WINDOW_WIDTH * y + 55, _str, LS_WINDOW_WIDTH, LS_WINDOW_WIDTH, color);
@ -2071,7 +2072,7 @@ static void _ShowSlotList(int a1)
} }
// 0x47E8E0 // 0x47E8E0
static void _DrawInfoBox(int a1) static void _DrawInfoBox(int slot)
{ {
blitBufferToBuffer(_loadsaveFrmImages[LOAD_SAVE_FRM_BACKGROUND].getData() + LS_WINDOW_WIDTH * 254 + 396, 164, 60, LS_WINDOW_WIDTH, gLoadSaveWindowBuffer + LS_WINDOW_WIDTH * 254 + 396, 640); blitBufferToBuffer(_loadsaveFrmImages[LOAD_SAVE_FRM_BACKGROUND].getData() + LS_WINDOW_WIDTH * 254 + 396, 164, 60, LS_WINDOW_WIDTH, gLoadSaveWindowBuffer + LS_WINDOW_WIDTH * 254 + 396, 640);
@ -2079,26 +2080,28 @@ static void _DrawInfoBox(int a1)
const char* text; const char* text;
int color = _colorTable[992]; int color = _colorTable[992];
switch (_LSstatus[a1]) { switch (_LSstatus[slot]) {
case SLOT_STATE_OCCUPIED: case SLOT_STATE_OCCUPIED:
do { if (1) {
STRUCT_613D30* ptr = &(_LSData[a1]); LoadSaveSlotData* ptr = &(_LSData[slot]);
fontDrawText(gLoadSaveWindowBuffer + LS_WINDOW_WIDTH * 254 + 396, ptr->character_name, LS_WINDOW_WIDTH, LS_WINDOW_WIDTH, color); fontDrawText(gLoadSaveWindowBuffer + LS_WINDOW_WIDTH * 254 + 396, ptr->characterName, LS_WINDOW_WIDTH, LS_WINDOW_WIDTH, color);
int v4 = ptr->field_70 / 600; snprintf(_str,
int v5 = v4 % 60; sizeof(_str),
int v6 = 25 * (v4 / 60 % 24); "%.2d %s %.4d %.4d",
int v21 = 4 * v6 + v5; ptr->gameDay,
getmsg(&gLoadSaveMessageList, &gLoadSaveMessageListItem, 116 + ptr->gameMonth),
text = getmsg(&gLoadSaveMessageList, &gLoadSaveMessageListItem, 116 + ptr->field_68); ptr->gameYear,
snprintf(_str, sizeof(_str), "%.2d %s %.4d %.4d", ptr->field_6A, text, ptr->field_6C, v21); 100 * ((ptr->gameTime / 600) / 60 % 24) + (ptr->gameTime / 600) % 60);
int v2 = fontGetLineHeight(); int v2 = fontGetLineHeight();
fontDrawText(gLoadSaveWindowBuffer + LS_WINDOW_WIDTH * (256 + v2) + 397, _str, LS_WINDOW_WIDTH, LS_WINDOW_WIDTH, color); fontDrawText(gLoadSaveWindowBuffer + LS_WINDOW_WIDTH * (256 + v2) + 397, _str, LS_WINDOW_WIDTH, LS_WINDOW_WIDTH, color);
const char* v22 = mapGetName(ptr->field_76, ptr->field_74); snprintf(_str,
const char* v9 = mapGetCityName(ptr->field_76); sizeof(_str),
snprintf(_str, sizeof(_str), "%s %s", v9, v22); "%s %s",
mapGetCityName(ptr->map),
mapGetName(ptr->map, ptr->elevation));
int y = v2 + 3 + v2 + 256; int y = v2 + 3 + v2 + 256;
short beginnings[WORD_WRAP_MAX_COUNT]; short beginnings[WORD_WRAP_MAX_COUNT];
@ -2113,7 +2116,7 @@ static void _DrawInfoBox(int a1)
y += v2 + 2; y += v2 + 2;
} }
} }
} while (0); }
return; return;
case SLOT_STATE_EMPTY: case SLOT_STATE_EMPTY:
// Empty. // Empty.
@ -2140,30 +2143,28 @@ static void _DrawInfoBox(int a1)
} }
// 0x47EC48 // 0x47EC48
static int _LoadTumbSlot(int a1) static int _LoadTumbSlot(int slot)
{ {
File* stream; if (_LSstatus[_slot_cursor] != SLOT_STATE_EMPTY
int v2; && _LSstatus[_slot_cursor] != SLOT_STATE_ERROR
&& _LSstatus[_slot_cursor] != SLOT_STATE_UNSUPPORTED_VERSION) {
v2 = _LSstatus[_slot_cursor];
if (v2 != 0 && v2 != 2 && v2 != 3) {
snprintf(_str, sizeof(_str), "%s\\%s%.2d\\%s", "SAVEGAME", "SLOT", _slot_cursor + 1, "SAVE.DAT"); snprintf(_str, sizeof(_str), "%s\\%s%.2d\\%s", "SAVEGAME", "SLOT", _slot_cursor + 1, "SAVE.DAT");
debugPrint(" Filename %s\n", _str); debugPrint(" Filename %s\n", _str);
stream = fileOpen(_str, "rb"); File* stream = fileOpen(_str, "rb");
if (stream == NULL) { if (stream == NULL) {
debugPrint("\nLOADSAVE: ** (A) Error reading thumbnail #%d! **\n", a1); debugPrint("\nLOADSAVE: ** (A) Error reading thumbnail #%d! **\n", slot);
return -1; return -1;
} }
if (fileSeek(stream, 131, SEEK_SET) != 0) { if (fileSeek(stream, 131, SEEK_SET) != 0) {
debugPrint("\nLOADSAVE: ** (B) Error reading thumbnail #%d! **\n", a1); debugPrint("\nLOADSAVE: ** (B) Error reading thumbnail #%d! **\n", slot);
fileClose(stream); fileClose(stream);
return -1; return -1;
} }
if (fileRead(_thumbnail_image, LS_PREVIEW_SIZE, 1, stream) != 1) { if (fileRead(_thumbnail_image, LS_PREVIEW_SIZE, 1, stream) != 1) {
debugPrint("\nLOADSAVE: ** (C) Error reading thumbnail #%d! **\n", a1); debugPrint("\nLOADSAVE: ** (C) Error reading thumbnail #%d! **\n", slot);
fileClose(stream); fileClose(stream);
return -1; return -1;
} }
@ -2175,7 +2176,7 @@ static int _LoadTumbSlot(int a1)
} }
// 0x47ED5C // 0x47ED5C
static int _GetComment(int a1) static int _GetComment(int slot)
{ {
// Maintain original position in original resolution, otherwise center it. // Maintain original position in original resolution, otherwise center it.
int commentWindowX = screenGetWidth() != 640 int commentWindowX = screenGetWidth() != 640
@ -2276,7 +2277,7 @@ static int _GetComment(int a1)
char description[LOAD_SAVE_DESCRIPTION_LENGTH]; char description[LOAD_SAVE_DESCRIPTION_LENGTH];
if (_LSstatus[_slot_cursor] == SLOT_STATE_OCCUPIED) { if (_LSstatus[_slot_cursor] == SLOT_STATE_OCCUPIED) {
strncpy(description, _LSData[a1].description, LOAD_SAVE_DESCRIPTION_LENGTH); strncpy(description, _LSData[slot].description, LOAD_SAVE_DESCRIPTION_LENGTH);
} else { } else {
memset(description, '\0', LOAD_SAVE_DESCRIPTION_LENGTH); memset(description, '\0', LOAD_SAVE_DESCRIPTION_LENGTH);
} }
@ -2285,8 +2286,8 @@ static int _GetComment(int a1)
int backgroundColor = *(_loadsaveFrmImages[LOAD_SAVE_FRM_BOX].getData() + _loadsaveFrmImages[LOAD_SAVE_FRM_BOX].getWidth() * 35 + 24); int backgroundColor = *(_loadsaveFrmImages[LOAD_SAVE_FRM_BOX].getData() + _loadsaveFrmImages[LOAD_SAVE_FRM_BOX].getWidth() * 35 + 24);
if (_get_input_str2(window, 507, 508, description, LOAD_SAVE_DESCRIPTION_LENGTH - 1, 24, 35, _colorTable[992], backgroundColor, 0) == 0) { if (_get_input_str2(window, 507, 508, description, LOAD_SAVE_DESCRIPTION_LENGTH - 1, 24, 35, _colorTable[992], backgroundColor, 0) == 0) {
strncpy(_LSData[a1].description, description, LOAD_SAVE_DESCRIPTION_LENGTH); strncpy(_LSData[slot].description, description, LOAD_SAVE_DESCRIPTION_LENGTH);
_LSData[a1].description[LOAD_SAVE_DESCRIPTION_LENGTH - 1] = '\0'; _LSData[slot].description[LOAD_SAVE_DESCRIPTION_LENGTH - 1] = '\0';
rc = 1; rc = 1;
} else { } else {
rc = 0; rc = 0;
@ -2416,7 +2417,7 @@ static int _PrepLoad(File* stream)
gameReset(); gameReset();
gameMouseSetCursor(MOUSE_CURSOR_WAIT_PLANET); gameMouseSetCursor(MOUSE_CURSOR_WAIT_PLANET);
gMapHeader.name[0] = '\0'; gMapHeader.name[0] = '\0';
gameTimeSetTime(_LSData[_slot_cursor].field_70); gameTimeSetTime(_LSData[_slot_cursor].gameTime);
return 0; return 0;
} }
@ -2424,7 +2425,7 @@ static int _PrepLoad(File* stream)
static int _EndLoad(File* stream) static int _EndLoad(File* stream)
{ {
wmMapMusicStart(); wmMapMusicStart();
dudeSetName(_LSData[_slot_cursor].character_name); dudeSetName(_LSData[_slot_cursor].characterName);
interfaceBarRefresh(); interfaceBarRefresh();
indicatorBarRefresh(); indicatorBarRefresh();
tileWindowRefresh(); tileWindowRefresh();
@ -2635,7 +2636,7 @@ static int _SlotMap2Game(File* stream)
return -1; return -1;
} }
if (mapLoadSaved(_LSData[_slot_cursor].file_name) == -1) { if (mapLoadSaved(_LSData[_slot_cursor].fileName) == -1) {
debugPrint("LOADSAVE: returning 13\n"); debugPrint("LOADSAVE: returning 13\n");
return -1; return -1;
} }
@ -2671,7 +2672,7 @@ static int _mygets(char* dest, File* stream)
} }
// 0x47FE58 // 0x47FE58
static int _copy_file(const char* a1, const char* a2) static int _copy_file(const char* existingFileName, const char* newFileName)
{ {
File* stream1; File* stream1;
File* stream2; File* stream2;
@ -2685,7 +2686,7 @@ static int _copy_file(const char* a1, const char* a2)
buf = NULL; buf = NULL;
result = -1; result = -1;
stream1 = fileOpen(a1, "rb"); stream1 = fileOpen(existingFileName, "rb");
if (stream1 == NULL) { if (stream1 == NULL) {
goto out; goto out;
} }
@ -2695,7 +2696,7 @@ static int _copy_file(const char* a1, const char* a2)
goto out; goto out;
} }
stream2 = fileOpen(a2, "wb"); stream2 = fileOpen(newFileName, "wb");
if (stream2 == NULL) { if (stream2 == NULL) {
goto out; goto out;
} }
@ -2836,7 +2837,7 @@ static int _SaveBackup()
char* v2 = _strmfe(_str2, "AUTOMAP.DB", "BAK"); char* v2 = _strmfe(_str2, "AUTOMAP.DB", "BAK");
snprintf(_str1, sizeof(_str1), "%s\\%s", _gmpath, v2); snprintf(_str1, sizeof(_str1), "%s\\%s", _gmpath, v2);
_automap_db_flag = 0; _automap_db_flag = false;
File* stream2 = fileOpen(_str0, "rb"); File* stream2 = fileOpen(_str0, "rb");
if (stream2 != NULL) { if (stream2 != NULL) {
@ -2846,7 +2847,7 @@ static int _SaveBackup()
return -1; return -1;
} }
_automap_db_flag = 1; _automap_db_flag = true;
} }
return 0; return 0;

2
src/loadsave.h
View File

@ -18,7 +18,7 @@ void _InitLoadSave();
void _ResetLoadSave(); void _ResetLoadSave();
int lsgSaveGame(int mode); int lsgSaveGame(int mode);
int lsgLoadGame(int mode); int lsgLoadGame(int mode);
int _isLoadingGame(); bool _isLoadingGame();
void lsgInit(); void lsgInit();
int _MapDirEraseFile_(const char* a1, const char* a2); int _MapDirEraseFile_(const char* a1, const char* a2);