Update environment callback logic

Author: RobLoach

src/ChaiLove.cpp

@@ -6,7 +6,6 @@
 ChaiLove* ChaiLove::m_instance = NULL;
 retro_input_state_t ChaiLove::input_state_cb = NULL;
 retro_input_poll_t ChaiLove::input_poll_cb = NULL;
-retro_environment_t ChaiLove::environ_cb = NULL;
 
 void ChaiLove::destroy() {
 	pntr_app_log(PNTR_APP_LOG_INFO, "[ChaiLove] Attempting to destroy ChaiLove");

src/ChaiLove.h

@@ -81,7 +81,6 @@ class ChaiLove {
 
 	static retro_input_state_t input_state_cb;
 	static retro_input_poll_t input_poll_cb;
-	static retro_environment_t environ_cb;
 
 	love::config config;
 	love::keyboard keyboard;

src/love/filesystem.cpp

@@ -72,18 +72,23 @@ void filesystem::mountlibretro() {
 	const char *save_dir = NULL;
 	const char *core_dir = NULL;
 
-	if (ChaiLove::environ_cb(RETRO_ENVIRONMENT_GET_LIBRETRO_PATH, &core_dir) && core_dir) {
+    retro_environment_t environ_cb = pntr_app_libretro_environ_cb(NULL);
+	if (environ_cb == NULL) {
+		pntr_app_log(PNTR_APP_LOG_ERROR, "[ChaiLove] No environment callback for filesystem");
+	}
+
+	if (environ_cb(RETRO_ENVIRONMENT_GET_LIBRETRO_PATH, &core_dir) && core_dir) {
 		// Make sure to get the directory of the core.
 		std::string parentPath(getParentDirectory(core_dir));
 		mount(parentPath, "/libretro/core", false);
 	}
-	if (ChaiLove::environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &system_dir) && system_dir) {
+	if (environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &system_dir) && system_dir) {
 		mount(system_dir, "/libretro/system", false);
 	}
-	if (ChaiLove::environ_cb(RETRO_ENVIRONMENT_GET_CORE_ASSETS_DIRECTORY, &assets_dir) && assets_dir) {
+	if (environ_cb(RETRO_ENVIRONMENT_GET_CORE_ASSETS_DIRECTORY, &assets_dir) && assets_dir) {
 		mount(assets_dir, "/libretro/assets", false);
 	}
-	if (ChaiLove::environ_cb(RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY, &save_dir) && save_dir) {
+	if (environ_cb(RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY, &save_dir) && save_dir) {
 		save_dir = *save_dir ? save_dir : system_dir;
 		mount(save_dir, "/libretro/saves", false);
 	} else if (system_dir) {

src/love/system.cpp

@@ -67,11 +67,15 @@ std::string system::getVersionString() {
 void system::updateVariables(config& t) {
 	// Update core option from the libretro variables.
 	struct retro_variable var = {0};
+    retro_environment_t environ_cb = pntr_app_libretro_environ_cb(NULL);
+	if (environ_cb == NULL) {
+		pntr_app_log(PNTR_APP_LOG_ERROR, "[ChaiLove] No environment callback for filesystem");
+	}
 
 	// Alpha Blending
 	var.key = "chailove_alphablending";
 	var.value = NULL;
-	if (ChaiLove::environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) {
+	if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) {
 		std::string varvalue(var.value);
 		if (varvalue == "disabled") {
 			t.options["alphablending"] = false;
@@ -81,7 +85,7 @@ void system::updateVariables(config& t) {
 	// High Quality
 	var.key = "chailove_highquality";
 	var.value = NULL;
-	if (ChaiLove::environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) {
+	if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) {
 		std::string varvalue(var.value);
 		if (varvalue == "disabled") {
 			t.options["highquality"] = false;
@@ -101,7 +105,13 @@ std::string system::getUsername() {
 	if (!m_usernameInitialized) {
 		m_usernameInitialized = true;
 		const char *username = NULL;
-		if (ChaiLove::environ_cb(RETRO_ENVIRONMENT_GET_USERNAME, &username) && username) {
+		retro_environment_t environ_cb = pntr_app_libretro_environ_cb(NULL);
+		if (environ_cb == NULL) {
+			pntr_app_log(PNTR_APP_LOG_ERROR, "[ChaiLove] Environment callback not set for getUsername");
+			return m_username;
+		}
+
+		if (environ_cb(RETRO_ENVIRONMENT_GET_USERNAME, &username) && username) {
 			m_username = std::string(username);
 		}
 	}

src/love/window.cpp

@@ -43,7 +43,12 @@ window& window::showMessageBox(const std::string& msg, int frames) {
 	retro_message retroMessage;
 	retroMessage.msg = msg.c_str();
 	retroMessage.frames = frames;
-	ChaiLove::environ_cb(RETRO_ENVIRONMENT_SET_MESSAGE, &retroMessage);
+	retro_environment_t environ_cb = pntr_app_libretro_environ_cb(NULL);
+	if (environ_cb == NULL) {
+		pntr_app_log(PNTR_APP_LOG_ERROR, "[ChaiLove] Environment callback not set for showMessageBox");
+		return *this;
+	}
+	environ_cb(RETRO_ENVIRONMENT_SET_MESSAGE, &retroMessage);
 	return *this;
 }
 

src/main.cpp

@@ -1,5 +1,6 @@
 #include <string.h>
 #include <stddef.h>
+#include "libretro.h"
 #define PROJECT_VERSION "2.0.0"
 
 void libretro_chailove_pntr_set_error(int error);
@@ -45,16 +46,19 @@ void libretro_chailove_pntr_set_error(int error) {
 }
 
 bool Init(pntr_app* app) {
-    ChaiLove::environ_cb = pntr_app_libretro_environ_cb(app);
-    if (ChaiLove::environ_cb == NULL) {
-        pntr_app_log(PNTR_APP_LOG_ERROR, "[ChaiLove] Environment callback not set");
+    retro_environment_t environ_cb = pntr_app_libretro_environ_cb(app);
+    if (environ_cb == NULL) {
+        pntr_app_log(PNTR_APP_LOG_ERROR, "[ChaiLove] Environment callback not set for Init");
         return false;
     }
 
     // Initialize PhysFS
-    if (PHYSFS_init((const char*)ChaiLove::environ_cb) == 0) {
-        pntr_app_log_ex(PNTR_APP_LOG_ERROR, "PHYSFS_init() failed: %s", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
-        return false;
+    if (PHYSFS_init((const char*)environ_cb) == 0) {
+        PHYSFS_ErrorCode code = PHYSFS_getLastErrorCode();
+        if (code != PHYSFS_ERR_IS_INITIALIZED) {
+            pntr_app_log_ex(PNTR_APP_LOG_ERROR, "PHYSFS_init() failed: %s", PHYSFS_getErrorByCode(code));
+            return false;
+        }
     }
 
     // Set up the chailove instance.