From 4b7bd4a10a130e6c2661f6106a1604be0209571b Mon Sep 17 00:00:00 2001 From: Struma Date: Thu, 23 Apr 2020 10:42:47 -0400 Subject: [PATCH] Begin the un-physfs-ening --- scripts/EssentialsCompatibility.rb | 6 ------ src/filesystem.mm | 6 ++++-- src/meson.build | 1 - 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/scripts/EssentialsCompatibility.rb b/scripts/EssentialsCompatibility.rb index 25347030..3a0b8cee 100644 --- a/scripts/EssentialsCompatibility.rb +++ b/scripts/EssentialsCompatibility.rb @@ -136,9 +136,3 @@ def pbScreenCapture nil end end - -alias old_pbDrawTextPositions pbDrawTextPositions -def pbDrawTextPositions(bitmap,textpos) - old_pbDrawTextPositions(bitmap, textpos.each{|i|i[2] += 4}) -end - diff --git a/src/filesystem.mm b/src/filesystem.mm index 0eaadbe6..d7f95595 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,14 +295,16 @@ 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); er *= PHYSFS_registerArchiver(&RGSS2_Archiver); er *= PHYSFS_registerArchiver(&RGSS3_Archiver); 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 f7ff907b..e769b968 100644 --- a/src/meson.build +++ b/src/meson.build @@ -100,7 +100,6 @@ main_source = files( 'sdlsoundsource.cpp', 'alstream.cpp', 'audiostream.cpp', - 'rgssad.cpp', 'vorbissource.cpp', 'windowvx.cpp', 'tilemapvx.cpp',