From da4cf017bf8220c16d7fa4ab2f3f79bca8105a94 Mon Sep 17 00:00:00 2001 From: kichikuou Date: Sat, 18 Feb 2023 09:37:44 +0900 Subject: [PATCH] Clean up savedata.h --- modules/SACT/SACT.c | 3 + modules/SACT/sprite_event.c | 3 + src/savedata.c | 67 ++++++++++++++++++++++ src/savedata.h | 110 +++++++----------------------------- src/sdl_event.c | 3 + 5 files changed, 95 insertions(+), 91 deletions(-) diff --git a/modules/SACT/SACT.c b/modules/SACT/SACT.c index 09dfecb..79f61ec 100644 --- a/modules/SACT/SACT.c +++ b/modules/SACT/SACT.c @@ -25,6 +25,9 @@ #include #include +#ifdef __EMSCRIPTEN__ +#include +#endif #include "portab.h" #include "system.h" diff --git a/modules/SACT/sprite_event.c b/modules/SACT/sprite_event.c index 5f8e319..f2a4d61 100644 --- a/modules/SACT/sprite_event.c +++ b/modules/SACT/sprite_event.c @@ -24,6 +24,9 @@ #include "config.h" #include +#ifdef __EMSCRIPTEN__ +#include +#endif #include "portab.h" #include "system.h" diff --git a/src/savedata.c b/src/savedata.c index bceadf4..341720d 100644 --- a/src/savedata.c +++ b/src/savedata.c @@ -29,6 +29,8 @@ #include #ifdef __EMSCRIPTEN__ #include +#else +typedef int emscripten_align1_int; #endif #include "portab.h" @@ -41,6 +43,71 @@ #include "selection.h" #include "message.h" +#define SAVE_DATAID "System3.5 SavaData(c)ALICE-SOFT" +#define SAVE_DATAVERSION 0x350200 + +typedef struct { + uint16_t x; + uint16_t y; + uint16_t width; + uint16_t height; +} RectangleW; + +typedef struct { + char ID[32]; + int version; + char gameName[28]; + uint8_t selMsgSize; + uint8_t selMsgColor; + uint8_t selBackColor; + uint8_t selFrameColor; + uint8_t msgMsgSize; + uint8_t msgMsgColor; + uint8_t msgBackColor; + uint8_t msgFrameColor; + uint8_t rsvB1; + uint8_t rsvB2; + uint8_t rsvB3; + uint8_t rsvB4; + uint8_t rsvB5; + uint8_t rsvB6; + uint8_t rsvB7; + uint8_t rsvB8; + int scoPage; + int scoIndex; + int rsvI1; + int rsvI2; + RectangleW selWinInfo[SELWINMAX]; + RectangleW msgWinInfo[MSGWINMAX]; + int stackinfo; + int varStr; + int rsvI3; + int rsvI4; + int varSys[256]; + int rsvI[228]; +} Ald_baseHdr; + +typedef struct { + int size; + int count; + int maxlen; + int rsv1; +} Ald_strVarHdr; + +typedef struct { + int size; + int rsv1; + int rsv2; + int rsv3; +} Ald_stackHdr; + +typedef struct { + emscripten_align1_int size; + emscripten_align1_int pageNo; + emscripten_align1_int rsv1; + emscripten_align1_int rsv2; +} Ald_sysVarHdr; + /* セーブデータ */ static int savefile_sysvar_cnt = SYSVAR_MAX; diff --git a/src/savedata.h b/src/savedata.h index 39e7100..4cff896 100644 --- a/src/savedata.h +++ b/src/savedata.h @@ -24,104 +24,32 @@ #ifndef __SAVEDATA__ #define __SAVEDATA__ -#ifdef __EMSCRIPTEN__ -#include -#else -typedef int emscripten_align1_int; -#endif - #include "portab.h" -#include "windowframe.h" -#define SAVE_MAXNUMBER (26) +#define SAVE_MAXNUMBER 26 -#define SAVE_SAVEERR (255) -#define SAVE_LOADERR (255) -#define SAVE_LOADSHORTAGE (254) -#define SAVE_OTHERERR (201) -#define SAVE_LOADOK (0) -#define SAVE_SAVEOK1 (1) -#define SAVE_SAVEOK0 (0) - -#define SAVE_DATAID "System3.5 SavaData(c)ALICE-SOFT" -#define SAVE_DATAVERSION 0x350200 - -typedef struct { - uint16_t x; - uint16_t y; - uint16_t width; - uint16_t height; -} RectangleW; - -typedef struct { - char ID[32]; - int version; - char gameName[28]; - uint8_t selMsgSize; - uint8_t selMsgColor; - uint8_t selBackColor; - uint8_t selFrameColor; - uint8_t msgMsgSize; - uint8_t msgMsgColor; - uint8_t msgBackColor; - uint8_t msgFrameColor; - uint8_t rsvB1; - uint8_t rsvB2; - uint8_t rsvB3; - uint8_t rsvB4; - uint8_t rsvB5; - uint8_t rsvB6; - uint8_t rsvB7; - uint8_t rsvB8; - int scoPage; - int scoIndex; - int rsvI1; - int rsvI2; - RectangleW selWinInfo[SELWINMAX]; - RectangleW msgWinInfo[MSGWINMAX]; - int stackinfo; - int varStr; - int rsvI3; - int rsvI4; - int varSys[256]; - int rsvI[228]; -} Ald_baseHdr; - -typedef struct { - int size; - int count; - int maxlen; - int rsv1; -} Ald_strVarHdr; - -typedef struct { - int size; - int rsv1; - int rsv2; - int rsv3; -} Ald_stackHdr; - -typedef struct { - emscripten_align1_int size; - emscripten_align1_int pageNo; - emscripten_align1_int rsv1; - emscripten_align1_int rsv2; -} Ald_sysVarHdr; +#define SAVE_SAVEERR 255 +#define SAVE_LOADERR 255 +#define SAVE_LOADSHORTAGE 254 +#define SAVE_OTHERERR 201 +#define SAVE_LOADOK 0 +#define SAVE_SAVEOK1 1 +#define SAVE_SAVEOK0 0 /* defined by variable.c */ extern int strvar_len; struct VarRef; -extern int save_loadAll(int no); -extern int save_saveAll(int no); -extern int save_loadPartial(int no, struct VarRef *vref, int cnt); -extern int save_savePartial(int no, struct VarRef *vref, int cnt); -extern int save_copyAll(int dstno, int srcno); -extern int save_vars_to_file(char *fname_utf8, struct VarRef *src, int cnt); -extern int load_vars_from_file(char *fname_utf8, struct VarRef *dest, int cnt); -extern int save_save_str_with_file(char *fname_utf8, int start, int cnt); -extern int save_load_str_with_file(char *fname_utf8, int start, int cnt); -extern const char *save_get_file(int index); -extern int save_delete_file(int index); +int save_loadAll(int no); +int save_saveAll(int no); +int save_loadPartial(int no, struct VarRef *vref, int cnt); +int save_savePartial(int no, struct VarRef *vref, int cnt); +int save_copyAll(int dstno, int srcno); +int save_vars_to_file(char *fname_utf8, struct VarRef *src, int cnt); +int load_vars_from_file(char *fname_utf8, struct VarRef *dest, int cnt); +int save_save_str_with_file(char *fname_utf8, int start, int cnt); +int save_load_str_with_file(char *fname_utf8, int start, int cnt); +const char *save_get_file(int index); +int save_delete_file(int index); #endif /* __SAVEDATA__ */ diff --git a/src/sdl_event.c b/src/sdl_event.c index a7e71a5..84ab2bd 100644 --- a/src/sdl_event.c +++ b/src/sdl_event.c @@ -27,6 +27,9 @@ #include #include #include +#ifdef __EMSCRIPTEN__ +#include +#endif #include "portab.h" #include "system.h"