From fd31d33274429059f666842d2d63b044103178e5 Mon Sep 17 00:00:00 2001 From: Nathan Fulton Date: Sat, 29 Apr 2017 23:27:41 -0400 Subject: [PATCH] Android gszMainDataDir = NULL Using NULL as the main data dir will tell the SDL API (the current host file I/O) to fallthough and read from the .apk assets. This is currently desirable in every existing case. --- game/sdl/android/jni/ht/hosthelpers.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game/sdl/android/jni/ht/hosthelpers.cpp b/game/sdl/android/jni/ht/hosthelpers.cpp index 76143df..dbbb360 100644 --- a/game/sdl/android/jni/ht/hosthelpers.cpp +++ b/game/sdl/android/jni/ht/hosthelpers.cpp @@ -30,7 +30,7 @@ static jmethodID getAssetManagerMethod; namespace wi { -char gszMainDataDir[PATH_MAX]; // data file (htdata832.pdb, htsfx.pdb) dir +// char gszMainDataDir[PATH_MAX]; // main data is archived into Android assets char gszTempDir[PATH_MAX]; // temp file directory char gszMissionPacksDir[PATH_MAX]; // downloaded mission packs char gszMissionPackInfosDir[PATH_MAX]; // info about downloaded mission packs @@ -149,7 +149,7 @@ void HostHelpers::Cleanup() { } const char *HostHelpers::GetMainDataDir() { - return gszMainDataDir; + return NULL; } const char *HostHelpers::GetTempDir() {