Move scriptfiles environment variable setup to InitModule so paths are correctly set for some users. Add getenv_portable (linux) and some checks in setenv_portable so it doesn't override environment vars, highly untested, changes are more than welcome.

Author: colistro123

amx-deps/src/CFunctions.cpp

@@ -127,14 +127,6 @@ int CFunctions::amxLoadPlugin(lua_State *luaVM) {
 
 	loadedPlugins[pluginName] = pSampPlugin;
 
-	//Setup environment variables
-	fs::path scriptfilespath = fs::path("mods/deathmatch/resources/amx/scriptfiles");
-	if (exists(scriptfilespath)) {
-		setenv_portable("AMXFILE", scriptfilespath.string().c_str(), 1);
-	} else {
-		pModuleManager->ErrorPrintf("scriptfiles directory doesn't exist at: %s\n", scriptfilespath.string());
-	}
-
 	lua_pushboolean(luaVM, 1);
 	return 1;
 }

amx-deps/src/ml_base.cpp

@@ -19,8 +19,10 @@
 #include "StdInc.h"
 
 #include <locale.h>
+#include <filesystem>
 
 using namespace std;
+namespace fs = std::filesystem;
 
 ILuaModuleManager10 *pModuleManager = NULL;
 lua_State *mainVM = NULL;
@@ -105,6 +107,20 @@ MTAEXPORT bool InitModule ( ILuaModuleManager10 *pManager, char *szModuleName, c
 	PATH += ";mods/deathmatch/resources/amx/plugins/";
 	setenv_portable("PATH", PATH.c_str(), 1);
 
+	//Setup environment variables
+	fs::path scriptfilespath = fs::canonical(fs::current_path() / fs::path("mods/deathmatch/resources/amx/scriptfiles"));
+
+	const char* envvar = getenv_portable("MTA_SCRIPTFILESDIR");
+	if (envvar != NULL)
+		fs::path scriptfilespath = envvar;
+
+	if (exists(scriptfilespath)) {
+		setenv_portable("AMXFILE", scriptfilespath.string().c_str(), 0);
+	}
+	else {
+		pModuleManager->ErrorPrintf("scriptfiles directory doesn't exist at: %s\n", scriptfilespath.string());
+	}
+
 	return true;
 }
 

amx-deps/src/util.cpp

@@ -10,12 +10,37 @@ extern map < AMX *, AMXPROPS > loadedAMXs;
 
 int setenv_portable(const char* name, const char* value, int overwrite) {
 #ifdef WIN32
+	if (!overwrite) {
+		const char* envvar = getenv_portable(name);
+		if (envvar != NULL) {
+			return 1; //It's not null, we succeeded, don't set it
+		}
+	} //Otherwise continue and set it anyway
 	return _putenv_s(name, value);
 #else
 	return setenv(name, value, overwrite);
 #endif
 }
 
+//Credit: https://stackoverflow.com/questions/4130180/how-to-use-vs-c-getenvironmentvariable-as-cleanly-as-possible
+const char* getenv_portable(const char* name)
+{
+#ifdef WIN32
+	const DWORD buffSize = 65535;
+	static char buffer[buffSize];
+	if (GetEnvironmentVariableA(name, buffer, buffSize))
+	{
+		return buffer;
+	}
+	else
+	{
+		return 0;
+	}
+#else
+	return getenv(name);
+#endif
+}
+
 #ifndef WIN32
 	void *getProcAddr ( HMODULE hModule, const char *szProcName )
 	{

amx-deps/src/util.h

@@ -29,6 +29,7 @@
 
 // Util functions
 int setenv_portable(const char* name, const char* value, int overwrite);
+const char* getenv_portable(const char* name);
 std::string ToUTF8(const char * str);
 std::string ToOriginalCP(const char * str);
 void lua_pushamxstring(lua_State *luaVM, AMX *amx, cell addr);