Merge pull request #120 from NeenGame/master

Fix native and update native names

dlc_afterhours/nightclubs.lua

@@ -259,7 +259,7 @@ AfterHoursNightclubs = {
 
             Enable = function(trophy, state, color, refresh)
                 SetIplPropState(AfterHoursNightclubs.interiorId, trophy, state, refresh)
-                SetInteriorPropColor(AfterHoursNightclubs.interiorId, trophy, color)
+                SetInteriorEntitySetColor(AfterHoursNightclubs.interiorId, trophy, color)
             end
         },
         DryIce = {
@@ -291,7 +291,7 @@ AfterHoursNightclubs = {
                     end
 
                     for key, emitter in pairs(AfterHoursNightclubs.Interior.DryIce.Emitters) do
-                        UseParticleFxAssetNextCall("scr_ba_club")
+                        UseParticleFxAsset("scr_ba_club")
                         StartParticleFxLoopedAtCoord("scr_ba_club_smoke_machine", emitter.pos.x, emitter.pos.y, emitter.pos.z, emitter.rot.x, emitter.rot.y, emitter.rot.z, AfterHoursNightclubs.Interior.DryIce.scale, false, false, false, true)
                     end
                 else

dlc_bikers/clubhouse1.lua

@@ -42,7 +42,7 @@ BikerClubhouse1 = {
             BikerClubhouse1.Walls.Clear(false)
 
             SetIplPropState(BikerClubhouse1.interiorId, walls, true, refresh)
-            SetInteriorPropColor(BikerClubhouse1.interiorId, walls, color)
+            SetInteriorEntitySetColor(BikerClubhouse1.interiorId, walls, color)
         end,
         Clear = function(refresh)
             SetIplPropState(BikerClubhouse1.interiorId, {
@@ -63,7 +63,7 @@ BikerClubhouse1 = {
             BikerClubhouse1.Furnitures.Clear(false)
 
             SetIplPropState(BikerClubhouse1.interiorId, furn, true, refresh)
-            SetInteriorPropColor(BikerClubhouse1.interiorId, furn, color)
+            SetInteriorEntitySetColor(BikerClubhouse1.interiorId, furn, color)
         end,
         Clear = function(refresh)
             SetIplPropState(BikerClubhouse1.interiorId, {

dlc_bikers/clubhouse2.lua

@@ -41,7 +41,7 @@ BikerClubhouse2 = {
             BikerClubhouse2.Walls.Clear(false)
 
             SetIplPropState(BikerClubhouse2.interiorId, walls, true, refresh)
-            SetInteriorPropColor(BikerClubhouse2.interiorId, walls, color)
+            SetInteriorEntitySetColor(BikerClubhouse2.interiorId, walls, color)
         end,
         Clear = function(refresh)
             SetIplPropState(BikerClubhouse2.interiorId, {
@@ -55,7 +55,7 @@ BikerClubhouse2 = {
 
         SetColor = function(color, refresh)
             SetIplPropState(BikerClubhouse2.interiorId, BikerClubhouse2.LowerWalls.default, true, refresh)
-            SetInteriorPropColor(BikerClubhouse2.interiorId, BikerClubhouse2.LowerWalls.default, color)
+            SetInteriorEntitySetColor(BikerClubhouse2.interiorId, BikerClubhouse2.LowerWalls.default, color)
         end,
     },
     Furnitures = {
@@ -83,7 +83,7 @@ BikerClubhouse2 = {
             BikerClubhouse2.Furnitures.Clear(false)
 
             SetIplPropState(BikerClubhouse2.interiorId, furn, true, refresh)
-            SetInteriorPropColor(BikerClubhouse2.interiorId, furn, color)
+            SetInteriorEntitySetColor(BikerClubhouse2.interiorId, furn, color)
         end,
         Clear = function(refresh)
             SetIplPropState(BikerClubhouse2.interiorId, {

dlc_bikers/gang.lua

@@ -245,7 +245,7 @@ BikerGang = {
                     ReleaseNamedRendertarget(GetHashKey(BikerGang.Clubhouse.ClubName.target))
                 end
 
-                if HasNamedScaleformMovieLoaded(BikerGang.Clubhouse.ClubName.movieId) then
+                if HasScaleformMovieFilenameLoaded(BikerGang.Clubhouse.ClubName.movieId) then
                     SetScaleformMovieAsNoLongerNeeded(BikerGang.Clubhouse.ClubName.movieId)
                 end
 
@@ -356,25 +356,25 @@ BikerGang = {
             SelectMission = function(position)
                 if BikerGang.Clubhouse.MissionsWall.movieId ~= -1 then
                     BeginScaleformMovieMethod(BikerGang.Clubhouse.MissionsWall.movieId, "SET_SELECTED_MISSION")
-                    PushScaleformMovieMethodParameterInt(position) -- Mission index 0 to 2 (-1 = no mission)
+                    ScaleformMovieMethodAddParamInt(position) -- Mission index 0 to 2 (-1 = no mission)
                     EndScaleformMovieMethod()
                 end
             end,
             SetMission = function(position, title, desc, textDict, x, y)
                 if BikerGang.Clubhouse.MissionsWall.needToLoad then
-                    if not HasNamedScaleformMovieLoaded(BikerGang.Clubhouse.MissionsWall.movieId) then
+                    if not HasScaleformMovieFilenameLoaded(BikerGang.Clubhouse.MissionsWall.movieId) then
                         BikerGang.Clubhouse.MissionsWall.movieId = LoadScaleform("BIKER_MISSION_WALL")
                     end
 
                     if BikerGang.Clubhouse.MissionsWall.movieId ~= -1 then
                         if position > -1 then
                             BeginScaleformMovieMethod(BikerGang.Clubhouse.MissionsWall.movieId, "SET_MISSION")
-                            PushScaleformMovieMethodParameterInt(position) -- Mission index 0 to 2 (-1 = no mission)
-                            PushScaleformMovieMethodParameterString(title)
-                            PushScaleformMovieMethodParameterString(desc)
-                            PushScaleformMovieMethodParameterButtonName(textDict)
-                            PushScaleformMovieMethodParameterFloat(x) -- Mission 0: world coordinates X
-                            PushScaleformMovieMethodParameterFloat(y) -- Mission 0: world coordinates Y
+                            ScaleformMovieMethodAddParamInt(position) -- Mission index 0 to 2 (-1 = no mission)
+                            ScaleformMovieMethodAddParamTextureNameString(title)
+                            ScaleformMovieMethodAddParamTextureNameString(desc)
+                            ScaleformMovieMethodAddParamPlayerNameString(textDict)
+                            ScaleformMovieMethodAddParamFloat(x) -- Mission 0: world coordinates X
+                            ScaleformMovieMethodAddParamFloat(y) -- Mission 0: world coordinates Y
                             EndScaleformMovieMethod()
                         else
                             -- Remove all missions
@@ -389,7 +389,7 @@ BikerGang = {
             end,
             RemoveMission = function(position)
                 BeginScaleformMovieMethod(BikerGang.Clubhouse.MissionsWall.movieId, "HIDE_MISSION")
-                PushScaleformMovieMethodParameterInt(position)
+                ScaleformMovieMethodAddParamInt(position)
                 EndScaleformMovieMethod()
             end,
             Clear = function()
@@ -402,7 +402,7 @@ BikerGang = {
                     ReleaseNamedRendertarget(GetHashKey(BikerGang.Clubhouse.MissionsWall.prop))
                 end
 
-                if HasNamedScaleformMovieLoaded(BikerGang.Clubhouse.MissionsWall.movieId) then
+                if HasScaleformMovieFilenameLoaded(BikerGang.Clubhouse.MissionsWall.movieId) then
                     SetScaleformMovieAsNoLongerNeeded(BikerGang.Clubhouse.MissionsWall.movieId)
                 end
 

dlc_doomsday/facility.lua

@@ -57,7 +57,7 @@ DoomsdayFacility = {
     },
     Walls = {
         SetColor = function(color, refresh)
-            SetInteriorPropColor(DoomsdayFacility.interiorId, "set_int_02_shell", color)
+            SetInteriorEntitySetColor(DoomsdayFacility.interiorId, "set_int_02_shell", color)
 
             if refresh then
                 RefreshInterior(DoomsdayFacility.interiorId)
@@ -104,7 +104,7 @@ DoomsdayFacility = {
             DoomsdayFacility.Lounge.Clear(false)
 
             SetIplPropState(DoomsdayFacility.interiorId, lounge, true, refresh)
-            SetInteriorPropColor(DoomsdayFacility.interiorId, lounge, color)
+            SetInteriorEntitySetColor(DoomsdayFacility.interiorId, lounge, color)
         end,
         Clear = function(refresh)
             SetIplPropState(DoomsdayFacility.interiorId, {
@@ -124,7 +124,7 @@ DoomsdayFacility = {
             DoomsdayFacility.Sleeping.Clear(false)
 
             SetIplPropState(DoomsdayFacility.interiorId, sleep, true, refresh)
-            SetInteriorPropColor(DoomsdayFacility.interiorId, sleep, color)
+            SetInteriorEntitySetColor(DoomsdayFacility.interiorId, sleep, color)
         end,
         Clear = function(refresh)
             SetIplPropState(DoomsdayFacility.interiorId, {
@@ -143,7 +143,7 @@ DoomsdayFacility = {
             DoomsdayFacility.Security.Clear(false)
 
             SetIplPropState(DoomsdayFacility.interiorId, security, true, refresh)
-            SetInteriorPropColor(DoomsdayFacility.interiorId, security, color)
+            SetInteriorEntitySetColor(DoomsdayFacility.interiorId, security, color)
         end,
         Clear = function(refresh)
             SetIplPropState(DoomsdayFacility.interiorId, {
@@ -160,7 +160,7 @@ DoomsdayFacility = {
             DoomsdayFacility.Cannon.Clear(false)
 
             SetIplPropState(DoomsdayFacility.interiorId, cannon, true, refresh)
-            SetInteriorPropColor(DoomsdayFacility.interiorId, cannon, color)
+            SetInteriorEntitySetColor(DoomsdayFacility.interiorId, cannon, color)
         end,
         Clear = function(refresh)
             SetIplPropState(DoomsdayFacility.interiorId, {
@@ -188,7 +188,7 @@ DoomsdayFacility = {
                         local privacyGlass = CreateObject(model, 367.99, 4827.745, -59.0, false, false, false)
 
                         SetEntityAsMissionEntity(privacyGlass, true, 0)
-                        SetEntityCollision_2(privacyGlass, false, 0)
+                        SetEntityCompletelyDisableCollision(privacyGlass, false, 0)
                         SetEntityInvincible(privacyGlass, true)
                         SetEntityAlpha(privacyGlass, 254, false)
                     end
@@ -275,7 +275,7 @@ DoomsdayFacility = {
                                 local privacyGlass = CreateObject(glass.modelHash, glass.entityPos.x, glass.entityPos.y, glass.entityPos.z, false, false, false)
 
                                 SetEntityAsMissionEntity(privacyGlass, true, false)
-                                SetEntityCollision_2(privacyGlass, false, 0)
+                                SetEntityCompletelyDisableCollision(privacyGlass, false, 0)
                                 SetEntityInvincible(privacyGlass, true)
                                 SetEntityAlpha(privacyGlass, 254, false)
                                 AttachEntityToEntity(privacyGlass, entityToAttach, -1, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0, 0, 0, 0, 2, 1)
@@ -366,7 +366,7 @@ DoomsdayFacility = {
             submarine = "set_int_02_trophy_sub",
 
             SetColor = function(color, refresh)
-                SetInteriorPropColor(DoomsdayFacility.interiorId, "set_int_02_trophy_sub", color)
+                SetInteriorEntitySetColor(DoomsdayFacility.interiorId, "set_int_02_trophy_sub", color)
 
                 if refresh then
                     RefreshInterior(DoomsdayFacility.interiorId)

dlc_finance/organization.lua

@@ -73,7 +73,7 @@ FinanceOrganization = {
                 ReleaseNamedRendertarget(GetHashKey(FinanceOrganization.Office.target))
             end
 
-            if HasNamedScaleformMovieLoaded(FinanceOrganization.Office.movieId) then
+            if HasScaleformMovieFilenameLoaded(FinanceOrganization.Office.movieId) then
                 SetScaleformMovieAsNoLongerNeeded(FinanceOrganization.Office.movieId)
             end
 

dlc_smuggler/hangar.lua

@@ -34,7 +34,7 @@ SmugglerHangar = {
 
         SetColor = function(color, refresh)
             SetIplPropState(SmugglerHangar.interiorId, SmugglerHangar.Walls.default, true, refresh)
-            SetInteriorPropColor(SmugglerHangar.interiorId, SmugglerHangar.Walls.default, color)
+            SetInteriorEntitySetColor(SmugglerHangar.interiorId, SmugglerHangar.Walls.default, color)
         end,
     },
     Floor = {
@@ -73,7 +73,7 @@ SmugglerHangar = {
                 SmugglerHangar.Floor.Decals.Clear(false)
 
                 SetIplPropState(SmugglerHangar.interiorId, decal, true, refresh)
-                SetInteriorPropColor(SmugglerHangar.interiorId, decal, color)
+                SetInteriorEntitySetColor(SmugglerHangar.interiorId, decal, color)
             end,
             Clear = function(refresh)
                 SetIplPropState(SmugglerHangar.interiorId, {
@@ -99,7 +99,7 @@ SmugglerHangar = {
 
             if crane ~= "" then
                 SetIplPropState(SmugglerHangar.interiorId, crane, true, refresh)
-                SetInteriorPropColor(SmugglerHangar.interiorId, crane, color)
+                SetInteriorEntitySetColor(SmugglerHangar.interiorId, crane, color)
             else
                 if refresh then
                     RefreshInterior(SmugglerHangar.interiorId)
@@ -123,7 +123,7 @@ SmugglerHangar = {
 
             if mod ~= "" then
                 SetIplPropState(SmugglerHangar.interiorId, mod, true, refresh)
-                SetInteriorPropColor(SmugglerHangar.interiorId, mod, color)
+                SetInteriorEntitySetColor(SmugglerHangar.interiorId, mod, color)
             else
                 if refresh then
                     RefreshInterior(SmugglerHangar.interiorId)
@@ -173,7 +173,7 @@ SmugglerHangar = {
 
                 if bed ~= "" then
                     SetIplPropState(SmugglerHangar.interiorId, bed, true, refresh)
-                    SetInteriorPropColor(SmugglerHangar.interiorId, "set_bedroom_tint", color)
+                    SetInteriorEntitySetColor(SmugglerHangar.interiorId, "set_bedroom_tint", color)
                 else
                     if refresh then
                         RefreshInterior(SmugglerHangar.interiorId)
@@ -223,7 +223,7 @@ SmugglerHangar = {
 
                 if light ~= "" then
                     SetIplPropState(SmugglerHangar.interiorId, "set_lighting_tint_props", true, refresh)
-                    SetInteriorPropColor(SmugglerHangar.interiorId, "set_lighting_tint_props", light)
+                    SetInteriorEntitySetColor(SmugglerHangar.interiorId, "set_lighting_tint_props", light)
                 else
                     if refresh then
                         RefreshInterior(SmugglerHangar.interiorId)

lib/common.lua

@@ -97,12 +97,12 @@ function SetIplPropState(interiorId, props, state, refresh)
             end
         else
             if state then
-                if not IsInteriorPropEnabled(interiorId, props) then
-                    EnableInteriorProp(interiorId, props)
+                if not IsInteriorEntitySetActive(interiorId, props) then
+                    ActivateInteriorEntitySet(interiorId, props)
                 end
             else
-                if IsInteriorPropEnabled(interiorId, props) then
-                    DisableInteriorProp(interiorId, props)
+                if IsInteriorEntitySetActive(interiorId, props) then
+                    DeactivateInteriorEntitySet(interiorId, props)
                 end
             end
         end
@@ -167,15 +167,15 @@ function SetupScaleform(movieId, scaleformFunction, parameters)
             local p = parameters["p" .. tostring(i)]
 
             if p.type == "bool" then
-                PushScaleformMovieMethodParameterBool(p.value)
+                ScaleformMovieMethodAddParamBool(p.value)
             elseif p.type == "int" then
-                PushScaleformMovieMethodParameterInt(p.value)
+                ScaleformMovieMethodAddParamInt(p.value)
             elseif p.type == "float" then
-                PushScaleformMovieMethodParameterFloat(p.value)
+                ScaleformMovieMethodAddParamFloat(p.value)
             elseif p.type == "string" then
-                PushScaleformMovieMethodParameterString(p.value)
+                ScaleformMovieMethodAddParamTextureNameString(p.value)
             elseif p.type == "buttonName" then
-                PushScaleformMovieMethodParameterButtonName(p.value)
+                ScaleformMovieMethodAddParamPlayerNameString(p.value)
             end
         end
     end
@@ -189,7 +189,7 @@ function LoadStreamedTextureDict(texturesDict)
     local timeout = 5 * 1000
     local currentTime = 0
 
-    RequestStreamedTextureDict(texturesDict, 0)
+    RequestStreamedTextureDict(texturesDict, false)
     while not HasStreamedTextureDictLoaded(texturesDict) do
         Citizen.Wait(step)