Add IsVehicleHaveUpgrades(model), optimized checks

Open-GTO · Nov 5, 2016 · fb1ef4a · fb1ef4a
1 parent ad44928
commit fb1ef4a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -24,6 +24,7 @@ GetVehicleCompatibleTypes(model, array[ZVEH_MAX_COMPONENT_TYPES], &array_size);
 GetVehicleComponentName(componentid, cname[], size = sizeof(cname));
 GetVehicleCompatibleUpgrades(model, array[ZVEH_MAX_COMPONENTS], &array_size);
 IsVehicleUpgradeCompatible(model, componentid);
+IsVehicleHaveUpgrades(model);
 ```
 
 # Directives

diff --git a/zvehcomp.inc b/zvehcomp.inc
@@ -2243,7 +2243,7 @@ stock GetVehicleCompatibleTypes(model, array[ZVEH_MAX_COMPONENT_TYPES], &array_s
 stock GetVehicleComponentName(componentid, cname[], size = sizeof(cname))
 {
 	new index = componentid - 1000;
-	if (index < 0 || index >= sizeof(gComponentName)) {
+	if (!(0 <= index < sizeof(gComponentName))) {
 		return 0;
 	}
 
@@ -2252,7 +2252,7 @@ stock GetVehicleComponentName(componentid, cname[], size = sizeof(cname))
 
 stock GetVehicleCompatibleUpgrades(model, array[ZVEH_MAX_COMPONENTS], &array_size)
 {
-	if (model < 400 || model > 611) {
+	if (!(400 <= model <= 611)) {
 		return 0;
 	}
 
@@ -2275,7 +2275,7 @@ stock GetVehicleCompatibleUpgrades(model, array[ZVEH_MAX_COMPONENTS], &array_siz
 
 stock IsVehicleUpgradeCompatible(model, componentid)
 {
-	if (model < 400 || model > 611) {
+	if (!(400 <= model <= 611)) {
 		return 0;
 	}
 
@@ -2298,3 +2298,11 @@ stock IsVehicleUpgradeCompatible(model, componentid)
 
 	return 0;
 }
+
+stock IsVehicleHaveUpgrades(model)
+{
+	if (!(400 <= model <= 611)) {
+		return 0;
+	}
+	return gComponents[model - 400]{0} == ZVEH_INVALID_COMPONENT_ID;
+}