Max/kichikuou_system3-sdl2
1
0
Fork 0
mirror of https://github.com/kichikuou/system3-sdl2.git synced 2026-10-06 05:48:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Refactor FILEIO

Browse Source
This commit is contained in:
kichikuou
2024-12-08 15:06:00 +09:00
parent 48d780add6
commit 8303f7c770
11 changed files with 229 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sys/nact_sys2.cpp
+44 -47
View File
@@ -750,42 +750,42 @@ void NACT_Sys2::cmd_l()
char file_name[_MAX_PATH];
snprintf(file_name, _MAX_PATH, "ASLEEP_%c.DAT", 'A' + index - 1);
FILEIO* fio = new FILEIO();
if(fio->Fopen(file_name, FILEIO_READ_BINARY | FILEIO_SAVEDATA)) {
fio->Fseek(112, FILEIO_SEEK_SET);
auto fio = FILEIO::open(file_name, FILEIO_READ_BINARY | FILEIO_SAVEDATA);
if (fio) {
fio->seek(112, SEEK_SET);
int next_page = fio->Fgetw() - 1;
fio->Fgetw();
fio->Fgetw(); // cg no?
fio->Fgetw();
int next_music = fio->Fgetw();
fio->Fgetw();
int next_addr = fio->Fgetw();
fio->Fgetw();
int next_page = fio->getw() - 1;
fio->getw();
fio->getw(); // cg no?
fio->getw();
int next_music = fio->getw();
fio->getw();
int next_addr = fio->getw();
fio->getw();
for(int i = 0; i < 512; i++) {
var[i] = fio->Fgetw();
var[i] = fio->getw();
}
ags->menu_font_size = fio->Fgetw();
ags->text_font_size = fio->Fgetw();
ags->palette_bank = fio->Fgetw();
ags->menu_font_size = fio->getw();
ags->text_font_size = fio->getw();
ags->palette_bank = fio->getw();
if(!ags->palette_bank) {
ags->palette_bank = -1;
}
ags->text_font_color = fio->Fgetw();
ags->menu_font_color = fio->Fgetw();
ags->menu_frame_color = fio->Fgetw();
ags->menu_back_color = fio->Fgetw();
ags->text_frame_color = fio->Fgetw();
ags->text_back_color = fio->Fgetw();
ags->text_font_color = fio->getw();
ags->menu_font_color = fio->getw();
ags->menu_frame_color = fio->getw();
ags->menu_back_color = fio->getw();
ags->text_frame_color = fio->getw();
ags->text_back_color = fio->getw();
for(int i = 0; i < 10; i++) {
ags->menu_w[i].sx = fio->Fgetw();
ags->menu_w[i].sy = fio->Fgetw();
ags->menu_w[i].ex = fio->Fgetw();
ags->menu_w[i].ey = fio->Fgetw();
ags->menu_w[i].push = fio->Fgetw() ? true : false;
ags->menu_w[i].frame = fio->Fgetw() ? true : false;
fio->Fgetw();
fio->Fgetw();
ags->menu_w[i].sx = fio->getw();
ags->menu_w[i].sy = fio->getw();
ags->menu_w[i].ex = fio->getw();
ags->menu_w[i].ey = fio->getw();
ags->menu_w[i].push = fio->getw() ? true : false;
ags->menu_w[i].frame = fio->getw() ? true : false;
fio->getw();
fio->getw();
if(ags->menu_w[i].screen) {
free(ags->menu_w[i].screen);
@@ -797,14 +797,14 @@ void NACT_Sys2::cmd_l()
ags->menu_w[i].window = NULL;
}
for(int i = 0; i < 10; i++) {
ags->text_w[i].sx = fio->Fgetw();
ags->text_w[i].sy = fio->Fgetw();
ags->text_w[i].ex = fio->Fgetw();
ags->text_w[i].ey = fio->Fgetw();
ags->text_w[i].push = fio->Fgetw() ? true : false;
ags->text_w[i].frame = fio->Fgetw() ? true : false;
fio->Fgetw();
fio->Fgetw();
ags->text_w[i].sx = fio->getw();
ags->text_w[i].sy = fio->getw();
ags->text_w[i].ex = fio->getw();
ags->text_w[i].ey = fio->getw();
ags->text_w[i].push = fio->getw() ? true : false;
ags->text_w[i].frame = fio->getw() ? true : false;
fio->getw();
fio->getw();
if(ags->text_w[i].screen) {
free(ags->text_w[i].screen);
@@ -816,19 +816,19 @@ void NACT_Sys2::cmd_l()
ags->text_w[i].window = NULL;
}
for(int i = 0; i < 10; i++) {
fio->Fread(tvar[i], 22, 1);
fio->read(tvar[i], 22);
}
for(int i = 0; i < 30; i++) {
for(int j = 0; j < 10; j++) {
fio->Fread(tvar_stack[i][j], 22, 1);
fio->read(tvar_stack[i][j], 22);
}
}
for(int i = 0; i < 30; i++) {
for(int j = 0; j < 20; j++) {
var_stack[i][j] = fio->Fgetw();
var_stack[i][j] = fio->getw();
}
}
fio->Fclose();
fio.reset();
load_scenario(next_page);
scenario_page = next_page;
@@ -836,7 +836,6 @@ void NACT_Sys2::cmd_l()
mako->play_music(next_music);
}
delete fio;
}
}
@@ -929,8 +928,8 @@ void NACT_Sys2::cmd_q()
char file_name[_MAX_PATH];
snprintf(file_name, _MAX_PATH, "ASLEEP_%c.DAT", 'A' + index - 1);
FILEIO* fio = new FILEIO();
if(fio->Fopen(file_name, FILEIO_WRITE_BINARY | FILEIO_SAVEDATA)) {
auto fio = FILEIO::open(file_name, FILEIO_WRITE_BINARY | FILEIO_SAVEDATA);
if (fio) {
uint8 buffer[9510];
int p = 0;
@@ -989,10 +988,8 @@ void NACT_Sys2::cmd_q()
}
}
fio->Fwrite(buffer, 9510, 1);
fio->Fclose();
fio->write(buffer, 9510);
}
delete fio;
}
}