From 4c35c1bb13030117c26bf331ed0611a8c47c4ab8 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Tue, 25 Mar 2014 00:49:03 -0700 Subject: [PATCH] Attempt to load VFS in headless on Android. Otherwise we don't get fonts, and savestates fail to load. --- headless/Headless.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/headless/Headless.cpp b/headless/Headless.cpp index 7125dbabbd..5d48360043 100644 --- a/headless/Headless.cpp +++ b/headless/Headless.cpp @@ -6,6 +6,7 @@ #include #include +#include "file/zip_read.h" #include "Common/FileUtil.h" #include "Core/Config.h" #include "Core/Core.h" @@ -375,6 +376,16 @@ int main(int argc, const char* argv[]) if (screenshotFilename != 0) headlessHost->SetComparisonScreenshot(screenshotFilename); +#ifdef ANDROID + // For some reason the debugger installs it with this name? + if (File::Exists("/data/app/org.ppsspp.ppsspp-2.apk")) { + VFSRegister("", new ZipAssetReader("/data/app/org.ppsspp.ppsspp-2.apk", "assets/")); + } + if (File::Exists("/data/app/org.ppsspp.ppsspp.apk")) { + VFSRegister("", new ZipAssetReader("/data/app/org.ppsspp.ppsspp.apk", "assets/")); + } +#endif + if (stateToLoad != NULL) SaveState::Load(stateToLoad);