work on __resource -> fxmanifest and RDR compatibility

resources/[managers]/mapmanager/fxmanifest.lua

@@ -8,7 +8,8 @@ server_scripts {
     "mapmanager_server.lua"
 }
 
-resource_manifest_version "77731fab-63ca-442c-a67b-abc70f28dfa5"
+fx_version 'adamant'
+games { 'gta5', 'rdr3' }
 
 server_export "getCurrentGameType"
 server_export "getCurrentMap"
@@ -16,4 +17,6 @@ server_export "changeGameType"
 server_export "changeMap"
 server_export "doesMapSupportGameType"
 server_export "getMaps"
-server_export "roundEnded"
+server_export "roundEnded"
+
+rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.'

resources/[managers]/mapmanager/mapmanager_client.lua

@@ -62,6 +62,10 @@ AddEventHandler('onResourceStop', function(res)
 end)
 
 AddEventHandler('getMapDirectives', function(add)
+	if not CreateScriptVehicleGenerator then
+		return
+	end
+
     add('vehicle_generator', function(state, name)
         return function(opts)
             local x, y, z, heading

resources/[managers]/spawnmanager/fxmanifest.lua

@@ -8,3 +8,8 @@ export 'loadSpawns'
 export 'setAutoSpawn'
 export 'setAutoSpawnCallback'
 export 'forceRespawn'
+
+fx_version 'adamant'
+games { 'rdr3', 'gta5' }
+
+rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.'

resources/[managers]/spawnmanager/spawnmanager.lua

@@ -187,6 +187,10 @@ local function freezePlayer(id, freeze)
 end
 
 function loadScene(x, y, z)
+	if not NewLoadSceneStart then
+		return
+	end
+
     NewLoadSceneStart(x, y, z, 0.0, 0.0, 0.0, 20.0, 0)
 
     while IsNewLoadSceneActive() do
@@ -258,14 +262,18 @@ function spawnPlayer(spawnIdx, cb)
 
             -- release the player model
             SetModelAsNoLongerNeeded(spawn.model)
+            
+            -- RDR3 player model bits
+            if N_0x283978a15512b2fe then
+				N_0x283978a15512b2fe(PlayerPedId(), true)
+            end
         end
 
         -- preload collisions for the spawnpoint
         RequestCollisionAtCoord(spawn.x, spawn.y, spawn.z)
 
         -- spawn the player
-        --ResurrectNetworkPlayer(GetPlayerId(), spawn.x, spawn.y, spawn.z, spawn.heading)
-        local ped = GetPlayerPed(-1)
+        local ped = PlayerPedId()
 
         -- V requires setting coords as well
         SetEntityCoordsNoOffset(ped, spawn.x, spawn.y, spawn.z, false, false, false, true)
@@ -328,7 +336,7 @@ Citizen.CreateThread(function()
     while true do
         Citizen.Wait(50)
 
-        local playerPed = GetPlayerPed(-1)
+        local playerPed = PlayerPedId()
 
         if playerPed and playerPed ~= -1 then
             -- check if we want to autospawn