Merge pull request #219 from emre1702/Fix_getVehicleNameFromModel_#8523

qaisjp · web-flow · commit 24fb0cc74fc9 · 2018-07-04T23:35:10.000+01:00
#8523 - Fix empty string in getVehicleNameFromModel (instead of false)
diff --git a/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
@@ -2470,7 +2470,7 @@ bool CStaticFunctionDefinitions::GetVehicleUpgradeSlotName(unsigned short usUpgr
 bool CStaticFunctionDefinitions::GetVehicleNameFromModel(unsigned short usModel, SString& strOutName)
 {
     strOutName = CVehicleNames::GetVehicleName(usModel);
-    return true;
+    return !strOutName.empty();
 }
 
 bool CStaticFunctionDefinitions::GetHelicopterRotorSpeed(CClientVehicle& Vehicle, float& fSpeed)
diff --git a/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
@@ -4903,7 +4903,7 @@ bool CStaticFunctionDefinitions::GetVehicleName(CVehicle* pVehicle, SString& str
 bool CStaticFunctionDefinitions::GetVehicleNameFromModel(unsigned short usModel, SString& strOutName)
 {
     strOutName = CVehicleNames::GetVehicleName(usModel);
-    return true;
+    return !strOutName.empty();
 }
 
 CPed* CStaticFunctionDefinitions::GetVehicleOccupant(CVehicle* pVehicle, unsigned int uiSeat)

Original file line number	Diff line number	Diff line change
`@@ -2470,7 +2470,7 @@ bool CStaticFunctionDefinitions::GetVehicleUpgradeSlotName(unsigned short usUpgr`
`2470`	`2470`	`bool CStaticFunctionDefinitions::GetVehicleNameFromModel(unsigned short usModel, SString& strOutName)`
`2471`	`2471`	`{`
`2472`	`2472`	`strOutName = CVehicleNames::GetVehicleName(usModel);`
`2473`		`- return true;`
	`2473`	`+ return !strOutName.empty();`
`2474`	`2474`	`}`
`2475`	`2475`
`2476`	`2476`	`bool CStaticFunctionDefinitions::GetHelicopterRotorSpeed(CClientVehicle& Vehicle, float& fSpeed)`
Original file line number	Diff line number	Diff line change
`@@ -4903,7 +4903,7 @@ bool CStaticFunctionDefinitions::GetVehicleName(CVehicle* pVehicle, SString& str`
`4903`	`4903`	`bool CStaticFunctionDefinitions::GetVehicleNameFromModel(unsigned short usModel, SString& strOutName)`
`4904`	`4904`	`{`
`4905`	`4905`	`strOutName = CVehicleNames::GetVehicleName(usModel);`
`4906`		`- return true;`
	`4906`	`+ return !strOutName.empty();`
`4907`	`4907`	`}`
`4908`	`4908`
`4909`	`4909`	`CPed* CStaticFunctionDefinitions::GetVehicleOccupant(CVehicle* pVehicle, unsigned int uiSeat)`