Use std::filesystem

Co-authored-by: colistro123 <colistro123@aol.com>

Author: qaisjp

amx-deps/src/CFunctions.cpp

@@ -17,9 +17,10 @@
 *********************************************************/
 
 #include "StdInc.h"
+#include <filesystem>
 
 using namespace std;
-using namespace boost::filesystem;
+namespace fs = std::filesystem;
 
 extern ILuaModuleManager10 *pModuleManager;
 
@@ -104,11 +105,14 @@ int CFunctions::amxLoad(lua_State *luaVM) {
 		return 1;
 	}
 
-	path amxPath = path("mods/deathmatch/resources/[gamemodes]/[amx]/") / resName / amxName;
+	char buff[256];
+	snprintf(buff, sizeof(buff), "%s/mods/deathmatch/resources/[gamemodes]/[amx]/%s/%s", fs::current_path().string().c_str(), resName, amxName);
+	fs::path amxPath = buff;
+	amxPath = fs::canonical(amxPath);
 
 	// Load .amx
 	AMX *amx = new AMX;
-	int err = aux_LoadProgram(amx, amxPath.string().c_str(), NULL);
+	int err = aux_LoadProgram(amx, buff, NULL);
 	if(err != AMX_ERR_NONE) {
 		delete amx;
 		lua_pushboolean(luaVM, 0);
@@ -145,7 +149,7 @@ int CFunctions::amxLoad(lua_State *luaVM) {
 
 	// Save info about the amx
 	AMXPROPS props;
-	props.filePath = amxPath;
+	props.filePath = amxPath.string();
 	props.resourceName = resName;
 	props.resourceVM = pModuleManager->GetResourceFromName(resName);
 

amx-deps/src/StdInc.h

@@ -8,8 +8,6 @@
 	#include <dlfcn.h>
 #endif
 
-#include <boost/filesystem.hpp>
-
 #include <stdio.h>
 #include <cstdarg>
 #include <cstring>
@@ -45,4 +43,4 @@ extern "C"
 #include "util.h"
 #include "CFunctions.h"
 
-#endif
+#endif

amx-deps/src/ml_base.cpp

@@ -18,6 +18,8 @@
 
 #include "StdInc.h"
 
+#include <locale.h>
+
 using namespace std;
 
 ILuaModuleManager10 *pModuleManager = NULL;

amx-deps/src/ml_base.h

@@ -4,9 +4,9 @@
 *
 *  ml_base, External lua add-on module
 *
-*  Copyright © 2003-2008 MTA.  All Rights Reserved.
+*  Copyright © 2003-2008 MTA.  All Rights Reserved.
 *
-*  Grand Theft Auto is © 2002-2003 Rockstar North
+*  Grand Theft Auto is © 2002-2003 Rockstar North
 *
 *  THE FOLLOWING SOURCES ARE PART OF THE MULTI THEFT
 *  AUTO SOFTWARE DEVELOPMENT KIT AND ARE RELEASED AS
@@ -31,7 +31,7 @@ int AMXCallPublicFilterScript(char *fnName);
 int AMXCallPublicGameMode(char *fnName);
 
 typedef struct {
-	boost::filesystem::path filePath;
+	std::string filePath;
 	std::string resourceName;
 	lua_State *resourceVM;
 } AMXPROPS;

amx-deps/src/util.cpp

@@ -1,9 +1,10 @@
 #include "StdInc.h"
 #include "UTF8.h"
 #include <cstdlib>
+#include <filesystem>
 
 using namespace std;
-using namespace boost::filesystem;
+namespace fs = std::filesystem;
 
 extern map < AMX *, AMXPROPS > loadedAMXs;
 
@@ -198,22 +199,22 @@ string getScriptFilePath(AMX *amx, const char *filename) {
 		return string();
 
 	// First check if it exists in the resource folder
-	path respath = loadedAMXs[amx].filePath;
-	respath = respath.remove_leaf() / filename;
+	fs::path respath = loadedAMXs[amx].filePath;
+	respath = respath.remove_filename() / filename;
 	if(exists(respath))
 		return respath.string();
 
 	// Then check if it exists in the main scriptfiles folder
-	path scriptfilespath = path("mods/deathmatch/resources/amx/scriptfiles") / filename;
+	fs::path scriptfilespath = fs::path("mods/deathmatch/resources/amx/scriptfiles") / filename;
 	if(exists(scriptfilespath))
 	{
 		return scriptfilespath.string();
 	}
 
 	// Otherwise default to amx's resource folder - make sure the folder
 	// where the file is expected exists
-	path folder = respath;
-	folder.remove_leaf();
+	fs::path folder = respath;
+	folder.remove_filename();
 	create_directories(folder);
 	return respath.string();
 }