Optimize cellToCrosshair function

diff --git a/qcsrc/menu/xonotic/crosshairpicker.qc b/qcsrc/menu/xonotic/crosshairpicker.qc
index 168ab9cf8d1f139fdc638d2497f04303a9e74fb6..eda416f68d8565e9105462b7583ca765b1e12cc3 100644 (file)
--- 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)
 {
 
 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 "";

+       return ftos(31 + cell.y * me.columns + cell.x);
+}

 
 vector crosshairpicker_crosshairToCell(entity me, string crosshair_str)
 {
 
 vector crosshairpicker_crosshairToCell(entity me, string crosshair_str)
 {