From 6df7e0ea2b68d472355e169112d11ee79f82128e Mon Sep 17 00:00:00 2001 From: terencehill Date: Sun, 3 May 2015 13:39:49 +0200 Subject: [PATCH] Optimize cellToCrosshair function --- qcsrc/menu/xonotic/crosshairpicker.qc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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) { -- 2.39.2