Update for b3586 (#138)

Co-authored-by: Mr-X-GTA <110748953+Mr-X-GTA@users.noreply.github.com>

metadata.json

@@ -1,6 +1,6 @@
 {
-    "game": {
-        "online": "1.71",
-        "build": "3570"
-    }
+  "game": {
+    "online": "1.71",
+    "build": "3586"
+  }
 }

src/core/data/all_script_names.hpp

@@ -211,6 +211,14 @@ namespace big
 	    "fm_content_arms_trafficking"_J,
 	    "AM_MP_HOTWIRE"_J,
 	    "fm_content_community_outreach"_J,
+	    "fm_content_car_wash_work"_J,
+	    "fm_content_car_wash_detailing"_J,
+	    "fm_content_helitours_work"_J,
+	    "fm_content_helitours_tour"_J,
+	    "fm_content_weed_shop_work"_J,
+	    "fm_content_weed_shop_delivery"_J,
+	    "fm_content_tycoon_odd_jobs"_J,
+	    "fm_content_cutscene"_J,
 	    "AM_BOAT_TAXI"_J,
 	    "AM_HELI_TAXI"_J,
 	    "fm_hold_up_tut"_J,
@@ -391,6 +399,9 @@ namespace big
 	    "am_mp_rc_vehicle",
 	    "am_mp_rpa_menu",
 	    "am_mp_salvage_yard",
+	    "am_mp_sb_car_wash",
+	    "am_mp_sb_heli_tours",
+	    "am_mp_sb_weed_shop",
 	    "am_mp_shooting_range",
 	    "am_mp_simeon_showroom",
 	    "am_mp_smoking_activity",
@@ -705,6 +716,8 @@ namespace big
 	    "fm_content_bounty_targets",
 	    "fm_content_business_battles",
 	    "fm_content_cargo",
+	    "fm_content_car_wash_detailing",
+	    "fm_content_car_wash_work",
 	    "fm_content_cerberus",
 	    "fm_content_chop_shop_delivery",
 	    "fm_content_clubhouse_contracts",
@@ -714,6 +727,7 @@ namespace big
 	    "fm_content_community_outreach",
 	    "fm_content_convoy",
 	    "fm_content_crime_scene",
+	    "fm_content_cutscene",
 	    "fm_content_daily_bounty",
 	    "fm_content_dispatch_work",
 	    "fm_content_drone",
@@ -731,6 +745,8 @@ namespace big
 	    "fm_content_hacker_whistle_prep",
 	    "fm_content_hacker_zancudo_fin",
 	    "fm_content_hacker_zancudo_prep",
+	    "fm_content_helitours_tour",
+	    "fm_content_helitours_work",
 	    "fm_content_hsw_setup",
 	    "fm_content_hsw_time_trial",
 	    "fm_content_island_dj",
@@ -759,6 +775,7 @@ namespace big
 	    "fm_content_test",
 	    "fm_content_tow_truck_work",
 	    "fm_content_tuner_robbery",
+	    "fm_content_tycoon_odd_jobs",
 	    "fm_content_ufo_abduction",
 	    "fm_content_vehicle_list",
 	    "fm_content_vehrob_arena",
@@ -771,6 +788,8 @@ namespace big
 	    "fm_content_vehrob_submarine",
 	    "fm_content_vehrob_task",
 	    "fm_content_vip_contract_1",
+	    "fm_content_weed_shop_delivery",
+	    "fm_content_weed_shop_work",
 	    "fm_content_xmas_mugger",
 	    "fm_content_xmas_truck",
 	    "fm_deathmatch_controler",
@@ -882,6 +901,7 @@ namespace big
 	    "general_test",
 	    "ggsm_arcade",
 	    "globals_fmmcstruct2_registration",
+	    "globals_fmmcstruct3_registration",
 	    "globals_fmmc_struct_registration",
 	    "golf",
 	    "golf_ai_foursome",
@@ -1231,6 +1251,8 @@ namespace big
 	    "salvage_yard_seating",
 	    "savegame_bed",
 	    "save_anywhere",
+	    "sb_heli_tours_seating",
+	    "sb_weed_shop_seating",
 	    "scaleformgraphictest",
 	    "scaleformminigametest",
 	    "scaleformprofiling",

src/hooks/protections/script_event_handler.cpp

@@ -375,7 +375,7 @@ namespace big
 		case eRemoteEvent::InteriorControl:
 		{
 			int interior = (int)args[3];
-			if (interior < 0 || interior > 173) // the upper bound will change after an update
+			if (interior < 0 || interior > 176) // the upper bound will change after an update
 			{
 				if (auto plyr = g_player_service->get_by_id(player->m_player_id))
 					session::add_infraction(plyr, Infraction::TRIED_KICK_PLAYER);

src/pointers.cpp

@@ -3,7 +3,7 @@
 #include "gta_pointers_layout_info.hpp"
 #include "sc_pointers_layout_info.hpp"
 
-#define GTA_VERSION_TARGET "1.71-3570.0"
+#define GTA_VERSION_TARGET "1.71-3586.0"
 
 namespace big
 {
@@ -1908,10 +1908,10 @@ namespace big
         // Network Can Access Multiplayer
         {
             "NCAM",
-            "E9 89 01 00 00 48 8B CF E8 13 A3 04 00",
+             "74 E0 33 D2 8B CB",
             [](memory::handle ptr)
             {
-                g_pointers->m_gta.m_network_can_access_multiplayer = ptr.add(0x23).rip().as<PVOID>();
+                g_pointers->m_gta.m_network_can_access_multiplayer = ptr.add(7).rip().as<PVOID>();
             }
         },
         // BattlEye Network Bail Patch

src/util/protection.cpp

@@ -115,7 +115,7 @@ namespace big::protection
 
 	bool should_allow_script_launch(int launcher_script)
 	{
-		if (launcher_script >= launcher_scripts.size())
+		if (static_cast<size_t>(launcher_script) >= launcher_scripts.size())
 			return false;
 
 		auto script = launcher_scripts[launcher_script];