Version 0.3.0

* libcurl is no longer needed
* DllMain now correctly handles directory creation errors
* Some improvements to SettingsController
* Build script improved
+ native.globalptr and native.scrbase isimplemented
+ Experimental GTAV support

Author: igor725

.github/workflows/release.yml

@@ -29,22 +29,23 @@ jobs:
 
       - name: Download ScriptHookSDK
         shell: pwsh
-        run: .\misc\ScriptHook.ps1
+        run: |
+          .\misc\ScriptHook.ps1
+          .\misc\ScriptHook.ps1 gtav
 
       - name: Detect MSVC
         uses: ilammy/msvc-dev-cmd@v1
         with:
           arch: x86_64
 
       - name: Build plugin
-        run: .\build.bat
+        run: |
+          .\build.bat
+          .\build.bat gtav
 
       - name: Build release archive
-        run: |
-          New-Item -Path ".\objs\output\" -Name "RedLua" -ItemType "directory"
-          Copy-Item .\LICENSE,.\README.md .\objs\output\
-          curl.exe -o.\objs\output\RedLua\natives.json https://raw.githubusercontent.com/alloc8or/rdr3-nativedb-data/master/natives.json
-          7z.exe a -tzip .\objs\out.zip .\objs\output\*.* -r
+        shell: pwsh
+        run: .\misc\Pack.ps1
 
       - name: Create release
         id: release
@@ -59,12 +60,22 @@ jobs:
           draft: false
           prerelease: true
 
-      - name: Upload assets
+      - name: Upload assets (RDR2)
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.release.outputs.upload_url }}
-          asset_path: .\objs\out.zip
+          asset_path: .\objs\outRDR2.zip
           asset_name: RedLua-${{ github.ref_name }}.zip
           asset_content_type: application/zip
+
+      - name: Upload assets (GTAV)
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.release.outputs.upload_url }}
+          asset_path: .\objs\outV.zip
+          asset_name: RedLuaV-${{ github.ref_name }}.zip
+          asset_content_type: application/zip

.gitignore

@@ -1,4 +1,5 @@
 .vscode/settings.json
-src/thirdparty/ScriptHook/
+src/thirdparty/ScriptHookRDR2/
+src/thirdparty/ScriptHookV/
 src/thirdparty/LuaJIT/
 objs/

.vscode/launch.json

@@ -7,7 +7,7 @@
 			"program": "D:\\LuaJIT\\src\\LuaJIT.exe",
 			"args": ["sl_test.lua"],
 			"stopAtEntry": false,
-			"cwd": "${workspaceFolder}\\objs\\output\\",
+			"cwd": "${workspaceFolder}\\objs\\outputRDR2\\",
 			"environment": [],
 			"console": "integratedTerminal",
 			"preLaunchTask": "Build RedLua (Standalone)"

README.md

@@ -4,7 +4,7 @@ RedLua is a ScriptHookRDR2 library that simplifies the game modding process.
 
 ## Installation
 
-Download the latest [release](https://github.com/igor725/RedLua/releases) and extract the archive contents into your game folder. **Note that the RedLua won't work without the [ScriptHookRDR2](https://www.dev-c.com/rdr2/scripthookrdr2/) library!**
+Download the latest [release](https://github.com/igor725/RedLua/releases) and extract the archive contents into your game folder (must be writeable). **Note that the RedLua won't work without the [ScriptHookRDR2](https://www.dev-c.com/rdr2/scripthookrdr2/) library!**
 
 ## Usage
 Press **F7** (hotkey can be modified in the `Settings.json` file, keycodes can be found [here](https://cherrytree.at/misc/vk.htm)) to open the RedLua menu. Here you can load/reload/stop/unload scripts, reload the NativeDB and change library settings.
@@ -165,7 +165,7 @@ misc.iskeyjustup(VK_*, exclusive = false)
 misc.resetkey(VK_*)
 
 -- Get game version
-misc.gamever() -- Returns: number, e.g. 1436.31
+misc.gamever() -- Returns: number (e.g. 1436.31) and string ("rdr3" or "gta5")
 
 -- Get RedLua version
 misc.libver() -- Returns: integer, e.g. 010, 020, etc.
@@ -181,4 +181,4 @@ Thanks to [Mike Pall](https://github.com/LuaJIT/LuaJIT), [Alexander Blade](https
 
 ## License
 
-RedLua is released under the MIT License. This license excludes files in the `src\thirdparty` folder that may be distributed under another license. Please read the `LICENSE` file for more information.
+RedLua is released under The MIT License. This license excludes files in the `src\thirdparty` that may be distributed under another license. Please read the `LICENSE` file for more information.

build.bat

@@ -4,6 +4,16 @@ IF NOT "%VSCMD_ARG_TGT_ARCH%"=="x64" (
 	EXIT /B 1
 )
 setlocal enableextensions enabledelayedexpansion
+SET RL_GTAV=0
+SET RL_STANDALONE=0
+
+:argparse
+IF "%1"=="gtav" SET RL_GTAV=1
+IF "%1"=="standalone" SET RL_STANDALONE=1
+IF "%1"=="" GOTO argdone
+SHIFT
+GOTO argparse
+:argdone
 SET RL_LUAJIT_SOURCE_DIR=.\src\thirdparty\LuaJIT\src
 IF NOT EXIST "%RL_LUAJIT_SOURCE_DIR%\lua51.lib" (
 	PUSHD %RL_LUAJIT_SOURCE_DIR%
@@ -14,35 +24,46 @@ IF NOT EXIST "%RL_LUAJIT_SOURCE_DIR%\lua51.lib" (
 	)
 	POPD
 )
-SET RL_SCRIPTHOOK_SDK_DIR=.\src\thirdparty\ScriptHook
+
 SET RL_OUT_BIN=RedLua.asi
-SET RL_OUT_PATH="D:\SteamLibrary\steamapps\common\Red Dead Redemption 2"
 SET RL_LIBS=user32.lib shell32.lib lua51.lib
 SET RL_SOURCES=src\*.cpp
 SET RL_LDFLAGS=/DLL /INCREMENTAL /LIBPATH:"%RL_LUAJIT_SOURCE_DIR%"
 SET RL_CFLAGS=/DELPP_NO_DEFAULT_LOG_FILE /DELPP_DISABLE_LOG_FILE_FROM_ARG ^
 /DELPP_THREAD_SAFE /DWIN32_LEAN_AND_MEAN /D_CRT_SECURE_NO_WARNINGS /FC /W2 ^
-/Isrc\ /EHsc /MP /DLL /Foobjs\
+/Isrc\ /EHsc /MP /DLL
+
+IF "%RL_GTAV%"=="1" (
+	SET RL_OUT_PATH="D:\Games\Grand Theft Auto V"
+	SET RL_SCRIPTHOOK_VARIANT=V
+	SET RL_CFLAGS=!RL_CFLAGS! /DREDLUA_GTAV
+) ELSE (
+	SET RL_OUT_PATH="D:\SteamLibrary\steamapps\common\Red Dead Redemption 2"
+	SET RL_SCRIPTHOOK_VARIANT=RDR2
+)
+
+SET RL_SCRIPTHOOK_SDK_DIR=.\src\thirdparty\ScriptHook!RL_SCRIPTHOOK_VARIANT!
 
-IF "%1"=="standalone" (
-	SET RL_OUT_PATH=".\objs\output"
+IF "%RL_STANDALONE%"=="1" (
+	SET RL_OUT_PATH=".\objs\output!RL_SCRIPTHOOK_VARIANT!"
 	SET RL_CFLAGS=!RL_CFLAGS! /DREDLUA_STANDALONE /Zi /MTd
 	SET RL_CFLAGS=!RL_CFLAGS! /Fd!RL_OUT_PATH!\ /DEBUG 
 	SET RL_SOURCES=!RL_SOURCES! src\thirdparty\easyloggingpp.cpp
 	SET RL_OUT_BIN=RedLua.dll	
 ) ELSE (
 	SET RL_CFLAGS=!RL_CFLAGS! /MT
-	SET RL_LIBS=!RL_LIBS! ScriptHookRDR2.lib
+	SET RL_LIBS=!RL_LIBS! ScriptHook!RL_SCRIPTHOOK_VARIANT!.lib
 	SET RL_SOURCES=!RL_SOURCES! src\thirdparty\*.cpp src\menus\*.cpp
 	SET RL_LDFLAGS=!RL_LDFLAGS! /LIBPATH:"!RL_SCRIPTHOOK_SDK_DIR!\lib"
 )
 
-MKDIR ".\objs\" 2> NUL
+MKDIR ".\objs\!RL_SCRIPTHOOK_VARIANT!" 2> NUL
+SET RL_CFLAGS=!RL_CFLAGS! /Foobjs\!RL_SCRIPTHOOK_VARIANT!\
 IF NOT EXIST !RL_OUT_PATH! (
-	SET RL_OUT_PATH=".\objs\output"
+	SET RL_OUT_PATH=".\objs\output!RL_SCRIPTHOOK_VARIANT!"
 	MKDIR !RL_OUT_PATH! 2> NUL
 )
-IF NOT "%1"=="standalone" IF NOT EXIST "!RL_OUT_PATH!\lua51.dll" (
+IF NOT "%RL_STANDALONE%"=="1" IF NOT EXIST "!RL_OUT_PATH!\lua51.dll" (
 	COPY %RL_LUAJIT_SOURCE_DIR%\lua51.dll %RL_OUT_PATH% 2> NUL
 )
 CL !RL_CFLAGS! /Fe!RL_OUT_PATH!\!RL_OUT_BIN! !RL_SOURCES! /link !RL_LDFLAGS! !RL_LIBS!

examples/RCE.lua/Libs/C/socket/core.dll

@@ -0,0 +1,58 @@
+return {
+	[100] = "Continue",
+	[101] = "Switching Protocols",
+	[200] = "OK",
+	[201] = "Created",
+	[202] = "Accepted",
+	[203] = "Non-Authoritative Information",
+	[204] = "No Content",
+	[205] = "Reset Content",
+	[206] = "Partial Content",
+	[300] = "Multiple Choices",
+	[301] = "Moved Permanently",
+	[302] = "Found",
+	[303] = "See Other",
+	[304] = "Not Modified",
+	[305] = "Use Proxy",
+	[307] = "Temporary Redirect",
+	[400] = "Bad Request",
+	[401] = "Unauthorized",
+	[402] = "Payment Required",
+	[403] = "Forbidden",
+	[404] = "Not Found",
+	[405] = "Method Not Allowed",
+	[406] = "Not Acceptable",
+	[407] = "Proxy Authentication Required",
+	[408] = "Request Timeout",
+	[409] = "Conflict",
+	[410] = "Gone",
+	[411] = "Length Required",
+	[412] = "Precondition Failed",
+	[413] = "Payload Too Large",
+	[414] = "URI Too Long",
+	[415] = "Unsupported Media Type",
+	[416] = "Range Not Satisfiable",
+	[417] = "Expectation Failed",
+	[418] = "I'm a teapot",
+	[426] = "Upgrade Required",
+	[500] = "Internal Server Error",
+	[501] = "Not Implemented",
+	[502] = "Bad Gateway",
+	[503] = "Service Unavailable",
+	[504] = "Gateway Time-out",
+	[505] = "HTTP Version Not Supported",
+	[102] = "Processing",
+	[207] = "Multi-Status",
+	[226] = "IM Used",
+	[308] = "Permanent Redirect",
+	[422] = "Unprocessable Entity",
+	[423] = "Locked",
+	[424] = "Failed Dependency",
+	[428] = "Precondition Required",
+	[429] = "Too Many Requests",
+	[431] = "Request Header Fields Too Large",
+	[451] = "Unavailable For Legal Reasons",
+	[506] = "Variant Also Negotiates",
+	[507] = "Insufficient Storage",
+	[511] = "Network Authentication Required"
+}