Max/nunuhara_xsystem4
1
0
Fork 0
mirror of https://github.com/nunuhara/xsystem4.git synced 2026-09-22 23:18:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #82 from kichikuou/mmap

Browse Source 
Do not use ARCHIVE_MMAP on 32-bit systems
This commit is contained in:
Nunuhara Cabbage
2022-11-26 20:34:01 -08:00
committed by GitHub
parent 31e91cc3ad 6efa31454d
commit 7aaa19404c
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/xsystem4.h
+2
View File
@@ -69,6 +69,8 @@ void get_time(int *hour, int *min, int *sec, int *ms);
#define XSYS4_DATA_DIR "/usr/local/share/xsystem4"
#endif
#define MMAP_IF_64BIT (sizeof(void*) >= 8 ? ARCHIVE_MMAP : 0)
extern bool game_daibanchou_en;
extern bool game_rance02_mg;
extern bool game_rance6_mg;
src/3d/reign.c
+1 -1
View File
@@ -169,7 +169,7 @@ struct RE_plugin *RE_plugin_new(void)
{
char *aar_path = gamedir_path("Data/ReignData.red");
int error = ARCHIVE_SUCCESS;
struct archive *aar = (struct archive *)aar_open(aar_path, ARCHIVE_MMAP, &error);
struct archive *aar = (struct archive *)aar_open(aar_path, MMAP_IF_64BIT, &error);
if (error == ARCHIVE_FILE_ERROR) {
WARNING("aar_open(\"%s\"): %s", display_utf0(aar_path), strerror(errno));
} else if (error == ARCHIVE_BAD_ARCHIVE_ERROR) {
src/asset_manager.c
+4 -4
View File
@@ -183,10 +183,10 @@ static bool afa_load_archive(struct asset_manager *_manager, const char *name)
snprintf(path, PATH_MAX, "%s.afa", name);
int error;
struct afa_archive *ar = afa_open(path, ARCHIVE_MMAP, &error);
struct afa_archive *ar = afa_open(path, MMAP_IF_64BIT, &error);
if (!ar) {
snprintf(path, PATH_MAX, "%s.AFA", name);
ar = afa_open(path, ARCHIVE_MMAP, &error);
ar = afa_open(path, MMAP_IF_64BIT, &error);
if (!ar) {
WARNING("Failed to open archive: %s", display_utf0(path));
return false;
@@ -324,7 +324,7 @@ static void ald_init(enum asset_type type, char **files, int count)
WARNING("Multiple asset archives for type %s", asset_strtype(type));
int error;
struct archive *ar = ald_open(files, count, ARCHIVE_MMAP, &error);
struct archive *ar = ald_open(files, count, MMAP_IF_64BIT, &error);
if (!ar)
ERROR("Failed to open ALD file: %s", archive_strerror(error));
@@ -343,7 +343,7 @@ static void afa_init(enum asset_type type, char *file)
WARNING("Multiple asset archives for type %s", asset_strtype(type));
int error;
struct afa_archive *ar = afa_open(file, ARCHIVE_MMAP, &error);
struct afa_archive *ar = afa_open(file, MMAP_IF_64BIT, &error);
if (!ar)
ERROR("Failed to open AFA file: %s", archive_strerror(error));
src/dungeon/dungeon.c
+2 -2
View File
@@ -99,7 +99,7 @@ static GLuint *load_event_textures(int *nr_textures_out)
{
char *path = gamedir_path("Data/Event.alk");
int error = ARCHIVE_SUCCESS;
struct alk_archive *alk = alk_open(path, ARCHIVE_MMAP, &error);
struct alk_archive *alk = alk_open(path, MMAP_IF_64BIT, &error);
if (error == ARCHIVE_FILE_ERROR) {
WARNING("alk_open(\"%s\"): %s", display_utf0(path), strerror(errno));
} else if (error == ARCHIVE_BAD_ARCHIVE_ERROR) {
@@ -146,7 +146,7 @@ bool dungeon_load(struct dungeon_context *ctx, int num)
if (ctx->version == DRAW_DUNGEON_1) {
char *path = gamedir_path("Data/DungeonData.dlf");
int error = ARCHIVE_SUCCESS;
struct archive *dlf = (struct archive *)dlf_open(path, ARCHIVE_MMAP, &error);
struct archive *dlf = (struct archive *)dlf_open(path, MMAP_IF_64BIT, &error);
if (error == ARCHIVE_FILE_ERROR) {
WARNING("dlf_open(\"%s\"): %s", display_utf0(path), strerror(errno));
} else if (error == ARCHIVE_BAD_ARCHIVE_ERROR) {
src/hll/MonsterInfo.c
+1 -1
View File
@@ -203,7 +203,7 @@ static bool MonsterInfo_Load(struct string *filename)
{
char *path = gamedir_path("Data/ReignData.red");
int error = ARCHIVE_SUCCESS;
struct archive *aar = (struct archive *)aar_open(path, ARCHIVE_MMAP, &error);
struct archive *aar = (struct archive *)aar_open(path, MMAP_IF_64BIT, &error);
if (error == ARCHIVE_FILE_ERROR) {
WARNING("aar_open(\"%s\"): %s", display_utf0(path), strerror(errno));
} else if (error == ARCHIVE_BAD_ARCHIVE_ERROR) {