From: terencehill <piuntn@gmail.com>
Date: Sun, 3 May 2015 11:39:49 +0000 (+0200)
Subject: Optimize cellToCrosshair function
X-Git-Tag: xonotic-v0.8.1~55^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6df7e0ea2b68d472355e169112d11ee79f82128e;p=xonotic%2Fxonotic-data.pk3dir.git

Optimize cellToCrosshair function
---

diff --git a/qcsrc/menu/xonotic/crosshairpicker.qc b/qcsrc/menu/xonotic/crosshairpicker.qc
index 168ab9cf8..eda416f68 100644
--- a/qcsrc/menu/xonotic/crosshairpicker.qc
+++ b/qcsrc/menu/xonotic/crosshairpicker.qc
@@ -16,12 +16,10 @@ entity makeXonoticCrosshairPicker();
 
 string crosshairpicker_cellToCrosshair(entity me, vector cell)
 {
-	float crosshair = 31 + cell.y * me.columns + cell.x;
-
-	if (crosshair >= 31 && crosshair < 31 + me.columns * me.rows)
-		return ftos(crosshair);
-	else
+	if(cell.x < 0 || cell.x >= me.columns || cell.y < 0 || cell.y >= me.rows)
 		return "";
+	return ftos(31 + cell.y * me.columns + cell.x);
+}
 
 vector crosshairpicker_crosshairToCell(entity me, string crosshair_str)
 {