Merge branch 'dev' of github.com:drakeee/altv-lua-module into dev

drakeee · Aug 24, 2022 · adebb2f · adebb2f
2 parents 208f60c + c71faf6
commit adebb2f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/Defs/Alt.cpp b/src/Defs/Alt.cpp
@@ -110,7 +110,7 @@ namespace lua::Class
 		lua_globalfunction(L, "getCharStat", GetCharStat);
 		lua_globalfunction(L, "resetCharStat", ResetCharStat);
 
-		lua_globalfunction(L, "isSandbox", IsSandbox);
+		//lua_globalfunction(L, "isSandbox", IsSandbox);
 
 		lua_globalfunction(L, "isKeyDown", IsKeyDown);
 		lua_globalfunction(L, "isKeyToggled", IsKeyToggled);
@@ -179,7 +179,7 @@ namespace lua::Class
 
 		lua_globalfunction(L, "copyToClipboard", CopyToClipboard);
 
-		lua_globalfunction(L, "toggleRmlControls", ToggleRmlControl);
+		lua_globalfunction(L, "toggleRmlControls", ToggleRmlControls);
 		lua_globalfunction(L, "loadRmlFont", LoadRmlFontFace);
 
 		lua_globalfunction(L, "worldToScreen", WorldToScreen);
@@ -824,11 +824,11 @@ namespace lua::Class
 		return 1;
 	}
 
-	int Alt::IsSandbox(lua_State* L)
+	/*int Alt::IsSandbox(lua_State* L)
 	{
 		lua_pushboolean(L, Core->IsSandbox());
 		return 1;
-	}
+	}*/
 
 	int Alt::IsKeyDown(lua_State* L)
 	{
@@ -1682,7 +1682,7 @@ namespace lua::Class
 		return 0;
 	}
 
-	int Alt::ToggleRmlControl(lua_State* L)
+	int Alt::ToggleRmlControls(lua_State* L)
 	{
 		bool state;
 
@@ -1695,7 +1695,7 @@ namespace lua::Class
 			return 0;
 		}
 
-		Core->ToggleRmlControl(state);
+		Core->ToggleRmlControls(state);
 
 		return 0;
 	}

diff --git a/src/Defs/Alt.h b/src/Defs/Alt.h
@@ -104,7 +104,7 @@ namespace lua::Class
 		static int GetCharStat(lua_State* L); //done
 		static int ResetCharStat(lua_State* L); //done
 
-		static int IsSandbox(lua_State* L); //done
+		//static int IsSandbox(lua_State* L); //done
 		static int IsKeyDown(lua_State* L); //done
 		static int IsKeyToggled(lua_State* L); //done
 		static int AreControlsEnabled(lua_State* L); //done
@@ -178,7 +178,7 @@ namespace lua::Class
 
 		static int ToggleRmlDebugger(lua_State* L);
 		static int LoadRmlFontFace(lua_State* L);
-		static int ToggleRmlControl(lua_State* L);
+		static int ToggleRmlControls(lua_State* L);
 
 		static int WorldToScreen(lua_State* L);
 		static int ScreenToWorld(lua_State* L);

diff --git a/src/Defs/Client/DiscordManager.cpp b/src/Defs/Client/DiscordManager.cpp
@@ -28,7 +28,7 @@ namespace lua::Class
 		{
 			lua_newtable(L);
 
-			lua_pushstring(L, discord->GetUserID());
+			lua_pushstring(L, std::to_string(discord->GetUserID()));
 			lua_setfield(L, -2, "id");
 
 			lua_pushstring(L, discord->GetUsername());

diff --git a/src/LuaScriptRuntime.h b/src/LuaScriptRuntime.h
@@ -78,7 +78,7 @@ class LuaScriptRuntime : public alt::IScriptRuntime
 	~LuaScriptRuntime() { };
 
 	char* _ALT_SDK_VERSION = (char*)ALT_SDK_VERSION; //disable annoying warnings in Linux build
-	const semver::version						version{ 1, 2, 9, _ALT_SDK_VERSION, semver::branch::dev };
+	const semver::version						version{ 1, 3, 0, _ALT_SDK_VERSION, semver::branch::dev };
 
 #ifdef ALT_SERVER_API
 	alt::config::Node::Dict						serverConfigDict;