Add suggested fixes by theSpool so stuff in the scriptfiles directory actually loads

Author: colistro123

amx-deps/src/CFunctions.cpp

@@ -127,6 +127,14 @@ 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

@@ -103,7 +103,7 @@ MTAEXPORT bool InitModule ( ILuaModuleManager10 *pManager, char *szModuleName, c
 
 	string PATH = getenv("PATH");
 	PATH += ";mods/deathmatch/resources/amx/plugins/";
-	setenv("PATH", PATH.c_str(), 1);
+	setenv_portable("PATH", PATH.c_str(), 1);
 
 	return true;
 }

amx-deps/src/util.cpp

@@ -8,15 +8,15 @@ namespace fs = std::filesystem;
 
 extern map < AMX *, AMXPROPS > loadedAMXs;
 
+int setenv_portable(const char* name, const char* value, int overwrite) {
 #ifdef WIN32
-
-	int setenv(const char* name, const char* value, int overwrite) {
-		((void)overwrite);
-		return SetEnvironmentVariable(name, value) ? 0 : -1;
-	}
-
+	return _putenv_s(name, value);
 #else
+	return setenv(name, value, overwrite);
+#endif
+}
 
+#ifndef WIN32
 	void *getProcAddr ( HMODULE hModule, const char *szProcName )
 	{
 		char *szError = NULL;
@@ -26,7 +26,6 @@ extern map < AMX *, AMXPROPS > loadedAMXs;
 			return NULL;
 		return pFunc;
 	}
-
 #endif
 
 std::string ToUTF8(const char * str)

amx-deps/src/util.h

@@ -9,9 +9,6 @@
 	#define getProcAddr GetProcAddress
 	#define loadLib LoadLibrary
 	#define freeLib FreeLibrary
-
-	int setenv(const char* name, const char* value, int overwrite);
-
 #else
 
 	#define HMODULE void*
@@ -31,6 +28,7 @@
 
 
 // Util functions
+int setenv_portable(const char* name, const char* value, int overwrite);
 std::string ToUTF8(const char * str);
 std::string ToOriginalCP(const char * str);
 void lua_pushamxstring(lua_State *luaVM, AMX *amx, cell addr);