Ported DrawRect, AllocateDrawRect & WorldToScreen to Enhanced

Author: Regynate

ChaosMod/Memory/Drawing.h

@@ -6,9 +6,6 @@
 // Adapted by MoneyWasted for ChaosModV
 // https://github.com/citizenfx/fivem/blob/master/code/components/extra-natives-five/src/Draw2dNatives.cpp
 
-// This file is manually formatted.
-// clang-format off
-
 #define MAX_LINES 5000
 
 namespace Memory
@@ -24,28 +21,44 @@ namespace Memory
 
 		if (!drawRects)
 		{
-			// Get our base handle at the beginning of the DRAW_RECT function.
-			Handle handle = Memory::FindPattern("48 8B C4 48 89 58 08 57 48 83 EC 70 48 63");
-			if (!handle.IsValid())
+			if (IsLegacy())
 			{
-				return;
+				// Get our base handle at the beginning of the DRAW_RECT function.
+				Handle handle = Memory::FindPattern("48 8B C4 48 89 58 08 57 48 83 EC 70 48 63");
+				if (!handle.IsValid())
+					return;
+
+				AllocateDrawRect     = handle.At(0x56).Into().Get<char *(void *)>();
+
+				auto offsetSDC       = getGameVersion() < eGameVersion::VER_1_0_3407_0 ? 0x92 : 0x97;
+				SetDrawRectCoords    = handle.At(offsetSDC).Into().Get<void(void *, float, float, float, float)>();
+
+				drawRects            = handle.At(0x32).Into().Get<char>();
+				drawRectsSize        = handle.At(0x2C).Value<int>();
+				mainThreadFrameIndex = handle.At(0x0E).Into().Get<int>();
 			}
+			else
+			{
+				Handle handle = Memory::FindPattern("44 0F 28 C8 48 63 05");
+				if (!handle.IsValid())
+					return;
 
-			AllocateDrawRect     = handle.At(0x56).Into().Get<char *(void *)>();
+				AllocateDrawRect     = handle.At(0x1C).Into().Get<char *(void *)>();
+				drawRects            = handle.At(0x14).Into().Get<char>();
+				drawRectsSize        = handle.At(0x0D).Value<int>();
+				mainThreadFrameIndex = handle.At(0x06).Into().Get<int>();
 
-			auto offsetSDC = getGameVersion() < eGameVersion::VER_1_0_3407_0 ? 0x92 : 0x97;
-			SetDrawRectCoords    = handle.At(offsetSDC).Into().Get<void(void *, float, float, float, float)>();
+				handle               = Memory::FindPattern("E8 ?? ?? ?? ?? B9 70 FF FF FF");
+				if (!handle.IsValid())
+					return;
 
-			drawRects            = handle.At(0x32).Into().Get<char>();
-			drawRectsSize        = handle.At(0x2C).Value<int>();
-			mainThreadFrameIndex = handle.At(0x0E).Into().Get<int>();
+				SetDrawRectCoords = handle.Into().Get<void(void *, float, float, float, float)>();
+			}
 
 			// At the instruction 'cmp edx, 500' in AllocateDrawRect.
-			handle = Memory::FindPattern("81 FA F4 01 00 00 73 13");
+			Handle handle = Memory::FindPattern("81 FA F4 01 00 00 73 13", "81 FA ?? ?? ?? ?? 77 14 48 8D 04 52");
 			if (!handle.IsValid())
-			{
 				return;
-			}
 
 			// Increase the number of lines that can be drawn.
 			Memory::Write<int>(handle.At(2).Get<int>(), MAX_LINES);
@@ -57,10 +70,10 @@ namespace Memory
 			SetDrawRectCoords(rect, x1, y1, x2, y2);
 
 			// Set unknown structure pointers.
-			*(std::uint32_t *)(rect + 0x34) &= 0xFA;
-			*(std::uint32_t *)(rect + 0x34) |= 0x8A;
-			*(float *)(rect + 0x1C)    = width;
-			*(std::uint32_t *)(rect + 0x28) = color;
+			*(std::uint32_t *)(rect + (IsLegacy() ? 0x34 : 0x48)) &= 0xFA;
+			*(std::uint32_t *)(rect + (IsLegacy() ? 0x34 : 0x48)) |= 0x8A;
+			*(float *)(rect + (IsLegacy() ? 0x1C : 0x30))         = width;
+			*(std::uint32_t *)(rect + (IsLegacy() ? 0x28 : 0x3C)) = color;
 		}
 	}
 

ChaosMod/Memory/WorldToScreen.h

@@ -8,7 +8,7 @@ namespace Memory
 
 		if (!WorldToScreen)
 		{
-			Handle handle = Memory::FindPattern("48 89 5C 24 ? 55 56 57 48 83 EC 70 65 4C 8B 0C 25");
+			Handle handle = Memory::FindPattern("48 89 5C 24 ? 55 56 57 48 83 EC 70 65 4C 8B 0C 25", "41 56 56 57 53 48 83 EC 78 0F 29 7C 24 60 0F 29 74 24 50 4D");
 			if (!handle.IsValid())
 				return false;