v1.0.5.0 "General bug fixes & support for latest patch. Retarget to .NET 4.6"

Author: Saltyq

source/core/DllMain.cpp

@@ -1,9 +1,6 @@
+bool sGameReloaded = false;
+
 #pragma managed
-#include <stdio.h>  /* defines FILENAME_MAX */
-#define WINDOWS
-#include <direct.h>
-#define GetCurrentDir _getcwd
-#include<iostream>
 
 // Import C# code base
 #using "ScriptHookRDRDotNet.netmodule"
@@ -22,7 +19,6 @@ namespace WinForms = System::Windows::Forms;
 // There is no version check performed for assemblies without strong names (https://docs.microsoft.com/en-us/dotnet/framework/deployment/how-the-runtime-locates-assemblies)
 [assembly:AssemblyKeyFileAttribute("PublicKeyToken.snk")];
 
-bool sGameReloaded = false;
 
 public ref class ScriptHookRDRDotNet
 {

source/core/Script.cs

@@ -129,6 +129,24 @@ void MainLoop()
 			}
 		}
 
+        private void TextPoolInit()
+        {
+            unsafe
+            {
+                if (firstTime)
+                {
+                    for (float i = 0.0f; i < 10.24; i += 0.01f)
+                    {
+                        NativeFunc.Invoke(0x4170B650590B3B00, 0.1f, 0.1f);
+                        NativeFunc.Invoke(0x50A41AD966910F03, 255, 255, 255, 1);
+                        var res = NativeFunc.Invoke(0xFA925AC00EB830B9, 10, "LITERAL_STRING", " ");
+                        NativeFunc.Invoke(0xD79334A4BB99BAD1, *res, i, i);
+                    }
+                    firstTime = false;
+                }
+            }
+        }
+
 		/// <summary>
 		/// Starts execution of this script.
 		/// </summary>
@@ -137,16 +155,7 @@ public void Start()
 			thread = new Thread(new ThreadStart(MainLoop));
 			thread.Start();
 
-            unsafe
-            {
-                if (firstTime)
-                {
-                    NativeFunc.Invoke(0x4170B650590B3B00, 0.1f, 0.1f);
-                    var res = NativeFunc.Invoke(0xFA925AC00EB830B9, 10, "LITERAL_STRING", " ");
-                    NativeFunc.Invoke(0xD79334A4BB99BAD1, *res, 0.0f, 0.0f);
-                    firstTime = false;
-                }
-            }
+            TextPoolInit();
 
             Log.Message(Log.Level.Info, "Started script ", Name, ".");
         }

source/scripting_v3/Properties/AssemblyInfo.cs

@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.0.4.6")]
-[assembly: AssemblyFileVersion("1.0.4.6")]
+[assembly: AssemblyVersion("1.0.5.0")]
+[assembly: AssemblyFileVersion("1.0.5.0")]

source/scripting_v3/RDR2.UI/Screen.cs

@@ -27,11 +27,11 @@ public static class Screen
 		/// <summary>
 		/// The base width of the screen used for all UI Calculations, unless ScaledDraw is used
 		/// </summary>
-		public const float Width = 1280f;
+		public const float Width = 1920f;
 		/// <summary>
 		/// The base height of the screen used for all UI Calculations
 		/// </summary>
-		public const float Height = 720f;
+		public const float Height = 1080f;
 
 		/// <summary>
 		/// Gets the actual screen resolution the game is being rendered at

source/scripting_v3/RDR2/World.cs

@@ -218,19 +218,28 @@ public static Blip CreateBlip(Vector3 position, float radius)
 
 		#region Entities
 
+
+		/// <summary>
+		/// This method is not fully tested. It uses a straight import from ScriptHookRDR2.dll, and if it is returning 0, then it is *probably* a SHRDR2 issue.
+		/// </summary>
 		public static Ped[] GetAllPeds()
 		{
 			int[] peds = new int[] {  };
 			RDR2DN.NativeMemory.getAllPeds(peds, 150);
 			return Array.ConvertAll(peds, handle => new Ped(handle));
 		}
+		/// <summary>
+		/// This method is not fully tested. It uses a straight import from ScriptHookRDR2.dll, and if it is returning 0, then it is *probably* a SHRDR2 issue.
+		/// </summary>
 		public static Vehicle[] GetAllVehicles()
 		{
 			int[] vehs = new int[] { };
 			RDR2DN.NativeMemory.getAllVehicles(vehs, 150);
 			return Array.ConvertAll(vehs, handle => new Vehicle(handle));
 		}
-		
+		/// <summary>
+		/// This method is not fully tested. It uses a straight import from ScriptHookRDR2.dll, and if it is returning 0, then it is *probably* a SHRDR2 issue.
+		/// </summary>
 		public static Prop[] GetAllProps()
 		{
 			int[] objs = new int[] { };
@@ -275,13 +284,19 @@ public static T GetClosest<T>(Vector3 position, params T[] spatials) where T : I
 			}
 			return (T)closest;
 		}
+		/// <summary>
+		/// This method is not fully tested. It uses a straight import from ScriptHookRDR2.dll, and if it is returning 0, then it is *probably* a SHRDR2 issue.
+		/// </summary>
 		public static Ped GetClosestPed(Vector3 position, float radius)
 		{
 			int[] peds = new int[] { };
 			RDR2DN.NativeMemory.getAllPeds(peds, 150);
 			Ped[] newPeds = Array.ConvertAll(peds, handle => new Ped(handle));
 			return GetClosest(position, newPeds);
 		}
+		/// <summary>
+		/// This method is not fully tested. It uses a straight import from ScriptHookRDR2.dll, and if it is returning 0, then it is *probably* a SHRDR2 issue.
+		/// </summary>
 		public static Vehicle GetClosestVehicle(Vector3 position, float radius)
 		{
 			int[] vehs = new int[] { };

source/scripting_v3/ScriptHookRDRDotNet_API.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RDR2</RootNamespace>
     <AssemblyName>ScriptHookRDRNetAPI</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>