From 622fed9e7037e3468df38bcd03bc83c10135f2f0 Mon Sep 17 00:00:00 2001 From: Roza Date: Mon, 4 May 2020 22:03:20 -0400 Subject: [PATCH] Revert RGSSAD changes I intend to rewrite a lot of the filesystem code someday -- actually I intended to start when I made this change -- but it turned out that I do not have as much time as I think I do. --- src/filesystem.mm | 6 +++--- src/meson.build | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/filesystem.mm b/src/filesystem.mm index d7f95595..780860ae 100644 --- a/src/filesystem.mm +++ b/src/filesystem.mm @@ -28,7 +28,7 @@ #import "eventthread.h" #import "exception.h" #import "font.h" -//#import "rgssad.h" +#import "rgssad.h" #import "sharedstate.h" #import "util.h" @@ -295,7 +295,7 @@ FileSystem::FileSystem(const char *argv0, bool allowSymlinks) { throwPhysfsError("Error initializing PhysFS"); /* One error (=return 0) turns the whole product to 0 */ -/* + int er = 1; er *= PHYSFS_registerArchiver(&RGSS1_Archiver); @@ -304,7 +304,7 @@ FileSystem::FileSystem(const char *argv0, bool allowSymlinks) { if (er == 0) throwPhysfsError("Error registering PhysFS RGSS archiver"); -*/ + p = new FileSystemPrivate; p->havePathCache = false; diff --git a/src/meson.build b/src/meson.build index e769b968..633feae3 100644 --- a/src/meson.build +++ b/src/meson.build @@ -107,7 +107,8 @@ main_source = files( 'autotilesvx.cpp', 'midisource.cpp', 'fluid-fun.cpp', - 'lang-fun.mm' + 'lang-fun.mm', + 'rgssad.cpp' ) if get_option('easypoke') == true and miniffi == true