Merge branch 'dev_v2'

crosire · Sep 11, 2018 · f5917b697b06c57df04e9a17449b6ff31c41202e · f5917b6
2 parents 25fccff + 0c4d092
commit f5917b697b06c57df04e9a17449b6ff31c41202e
Unified Split

Showing with 23 additions and 4 deletions.

+2 −2 source/scripting/Game.cpp

+8 −2 source/scripting/Game.hpp

+13 −0 source/scripting/VehicleHashes.hpp
diff --git a/source/scripting/Game.cpp b/source/scripting/Game.cpp
@@ -175,7 +175,7 @@ namespace GTA
 	GTA::RadioStation Game::RadioStation::get()
 	{
 		System::String ^radioName = Native::Function::Call<System::String ^>(Native::Hash::GET_PLAYER_RADIO_STATION_NAME);
-		if (System::String::Equals(radioName, ""))
+		if (System::String::Equals(radioName, "OFF"))
 		{
 			return GTA::RadioStation::RadioOff;
 		}
@@ -192,7 +192,7 @@ namespace GTA
 		}
 		else
 		{
-			Native::Function::Call(Native::Hash::SET_RADIO_TO_STATION_NAME, "");
+			Native::Function::Call(Native::Hash::SET_RADIO_TO_STATION_NAME, "OFF");
 		}
 	}
 	System::Drawing::Size Game::ScreenResolution::get()

diff --git a/source/scripting/Game.hpp b/source/scripting/Game.hpp
@@ -51,7 +51,9 @@ namespace GTA
 		VER_1_0_1290_1_STEAM,
 		VER_1_0_1290_1_NOSTEAM,
 		VER_1_0_1365_1_STEAM,
-		VER_1_0_1365_1_NOSTEAM
+		VER_1_0_1365_1_NOSTEAM,
+		VER_1_0_1493_0_STEAM,
+		VER_1_0_1493_0_NOSTEAM
 	};
 	public enum class Language
 	{
@@ -67,9 +69,11 @@ namespace GTA
 		Chinese,
 		Japanese,
 		Mexican,
+		ChineseSimplified
 	};
 	public enum class RadioStation
 	{
+		Unknown = -1,
 		LosSantosRockRadio = 0,
 		NonStopPopFM = 1,
 		RadioLosSantos = 2,
@@ -89,6 +93,8 @@ namespace GTA
 		VinewoodBoulevardRadio = 16,
 		SelfRadio = 17,
 		TheLab = 18,
+		BlondedLosSantos = 19,
+		LosSantosUndergroundRadio = 20,
 		RadioOff = 255,
 	};
 	public enum class WindowTitle
@@ -312,7 +318,7 @@ namespace GTA
 		static System::String ^GetUserInput(WindowTitle windowTitle, System::String^ defaultText, int maxLength);
 
 	internal:
-		static initonly array<System::String ^> ^_radioNames = { "RADIO_01_CLASS_ROCK", "RADIO_02_POP", "RADIO_03_HIPHOP_NEW", "RADIO_04_PUNK", "RADIO_05_TALK_01", "RADIO_06_COUNTRY", "RADIO_07_DANCE_01", "RADIO_08_MEXICAN", "RADIO_09_HIPHOP_OLD", "RADIO_11_TALK_02", "RADIO_12_REGGAE", "RADIO_13_JAZZ", "RADIO_14_DANCE_02", "RADIO_15_MOTOWN", "RADIO_16_SILVERLAKE", "RADIO_17_FUNK", "RADIO_18_90S_ROCK", "RADIO_19_USER", "RADIO_20_THELAB", "RADIO_OFF" };
+		static initonly array<System::String ^> ^_radioNames = { "RADIO_01_CLASS_ROCK", "RADIO_02_POP", "RADIO_03_HIPHOP_NEW", "RADIO_04_PUNK", "RADIO_05_TALK_01", "RADIO_06_COUNTRY", "RADIO_07_DANCE_01", "RADIO_08_MEXICAN", "RADIO_09_HIPHOP_OLD", "RADIO_11_TALK_02", "RADIO_12_REGGAE", "RADIO_13_JAZZ", "RADIO_14_DANCE_02", "RADIO_15_MOTOWN", "RADIO_16_SILVERLAKE", "RADIO_17_FUNK", "RADIO_18_90S_ROCK", "RADIO_19_USER", "RADIO_20_THELAB", "RADIO_21_DLC_XM17", "RADIO_22_DLC_BATTLE_MIX1_RADIO", "RADIO_OFF" };
 
 	private:
 		static GameVersion _gameVersion = GameVersion::Unknown;

diff --git a/source/scripting/VehicleHashes.hpp b/source/scripting/VehicleHashes.hpp
@@ -62,6 +62,7 @@ namespace GTA
 			Blazer5 = 2704629607u,
 			Blimp = 4143991942u,
 			Blimp2 = 3681241380u,
+			Blimp3 = 3987008919u,
 			Blista = 3950024287u,
 			Blista2 = 1039032026u,
 			Blista3 = 3703315515u,
@@ -205,6 +206,7 @@ namespace GTA
 			Forklift = 1491375716u,
 			FMJ = 1426219628u,
 			FQ2 = 3157435195u,
+			Freecrawler = 4240635011u,
 			Freight = 1030400667u,
 			FreightCar = 184361638u,
 			FreightCont1 = 920453016u,
@@ -285,6 +287,7 @@ namespace GTA
 			Lynx = 482197771u,
 			Mamba = 2634021974u,
 			Mammatus = 2548391185u,
+			Menacer = 2044532910u,
 			Manana = 2170765704u,
 			Manchez = 2771538552u,
 			Marquis = 3251507587u,
@@ -313,6 +316,7 @@ namespace GTA
 			Mule = 904750859u,
 			Mule2 = 3244501995u,
 			Mule3 = 2242229361u,
+			Mule4 = 1945374990u,
 			Nemesis = 3660088182u,
 			Neon = 2445973230u,
 			Nero = 1034187331u,
@@ -326,6 +330,7 @@ namespace GTA
 			Nokota = 1036591958u,
 			Omnis = 3517794615u,
 			Oppressor = 884483972u,
+			Oppressor2 = 2069146067u,
 			Oracle = 1348744438u,
 			Oracle2 = 3783366066u,
 			Osiris = 1987142870u,
@@ -335,6 +340,7 @@ namespace GTA
 			Pariah = 867799010u,
 			Patriot = 3486509883u,
 			PBus = 2287941233u,
+			PBus2 = 345756458u,
 			PCJ = 3385765638u,
 			Penetrator = 2536829930u,
 			Penumbra = 3917501776u,
@@ -358,6 +364,7 @@ namespace GTA
 			Pony = 4175309224u,
 			Pony2 = 943752001u,
 			Pounder = 2112052861u,
+			Pounder2 = 1653666139u,
 			Prairie = 2844316578u,
 			Pranger = 741586030u,
 			Predator = 3806844075u,
@@ -424,6 +431,7 @@ namespace GTA
 			Schafter6 = 1922255844u,
 			Schwarzer = 3548084598u,
 			Scorcher = 4108429845u,
+			Scramjet = 3656405053u,
 			Scrap = 2594165727u,
 			Seabreeze = 3902291871u,
 			Seashark = 3264692260u,
@@ -452,7 +460,9 @@ namespace GTA
 			Speeder2 = 437538602u,
 			Speedo = 3484649228u,
 			Speedo2 = 728614474u,
+			Speedo4 = 219613597u,
 			Squalo = 400514754u,
+			Stafford = 321186144u,
 			Stalion = 1923400478u,
 			Stalion2 = 3893323758u,
 			Stanier = 2817386317u,
@@ -464,6 +474,7 @@ namespace GTA
 			Stratum = 1723137093u,
 			Streiter = 1741861769u,
 			Stretch = 2333339779u,
+			Strikeforce = 1692272545u,
 			Stromberg = 886810209u,
 			Stunt = 2172210288u,
 			Submersible = 771711535u,
@@ -480,6 +491,7 @@ namespace GTA
 			Surge = 2400073108u,
 			Swift2 = 1075432268u,
 			Swift = 3955379698u,
+			Swinger = 500482303u,
 			T20 = 1663218586u,
 			Taco = 1951180813u,
 			Tailgater = 3286105550u,
@@ -495,6 +507,7 @@ namespace GTA
 			Technical2 = 1180875963u,
 			Technical3 = 1356124575u,
 			Tempesta = 272929391u,
+			Terrorbyte = 2306538597u,
 			Tezeract = 1031562256u,
 			Thrust = 1836027715u,
 			Thruster = 1489874736u,