From: terencehill <piuntn@gmail.com>
Date: Mon, 13 Jul 2015 19:52:22 +0000 (+0200)
Subject: Self explanatory function name
X-Git-Tag: xonotic-v0.8.1~22^2~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=89f4e7776423fae1268efcee0dda61d8c4bf34d3;p=xonotic%2Fxonotic-data.pk3dir.git

Self explanatory function name

Signed-off-by: terencehill <piuntn@gmail.com>
---

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index b61fe2a5d..6845ce415 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -159,7 +159,7 @@ float HUD_GetRowCount(int item_count, vector size, float item_aspect)
 	return bound(1, floor((sqrt(4 * item_aspect * aspect * item_count + aspect * aspect) + aspect + 0.5) / 2), item_count);
 }
 
-vector HUD_GetTableSize(int item_count, vector psize, float item_aspect)
+vector HUD_GetTableSize_BestItemAR(int item_count, vector psize, float item_aspect)
 {
 	float columns, rows;
 	float ratio, best_ratio = 0;
@@ -601,7 +601,7 @@ void HUD_Weapons(void)
 		vector padded_panel_size = panel_size - '2 2 0' * panel_bg_padding;
 
 		// get the all-weapons layout
-		vector table_size = HUD_GetTableSize(WEP_COUNT, padded_panel_size, aspect);
+		vector table_size = HUD_GetTableSize_BestItemAR(WEP_COUNT, padded_panel_size, aspect);
 		columns = table_size.x;
 		rows = table_size.y;
 		weapon_size.x = padded_panel_size.x / columns;
@@ -764,7 +764,7 @@ void HUD_Weapons(void)
 
 	if(!rows) // if rows is > 0 onlyowned code has already updated these vars
 	{
-		vector table_size = HUD_GetTableSize(WEP_COUNT, panel_size, aspect);
+		vector table_size = HUD_GetTableSize_BestItemAR(WEP_COUNT, panel_size, aspect);
 		columns = table_size.x;
 		rows = table_size.y;
 		weapon_size.x = panel_size.x / columns;
diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc
index d4e0f6280..79cff99e3 100644
--- a/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@ -294,7 +294,7 @@ float MapVote_Selection(vector topleft, vector cellsize, float rows, float colum
 	return mv_mouse_selection;
 }
 
-vector HUD_GetTableSize(int item_count, vector psize, float item_aspect);
+vector HUD_GetTableSize_BestItemAR(int item_count, vector psize, float item_aspect);
 void MapVote_Draw()
 {
 	string map;
@@ -364,7 +364,7 @@ void MapVote_Draw()
 		mv_num_maps -= 1;
 
 	int item_aspect = (gametypevote) ? 2/1 : 4/3;
-	vector table_size = HUD_GetTableSize(mv_num_maps, eX * (xmax - xmin) + eY * (ymax - ymin), item_aspect);
+	vector table_size = HUD_GetTableSize_BestItemAR(mv_num_maps, eX * (xmax - xmin) + eY * (ymax - ymin), item_aspect);
 	mv_columns = table_size.x;
 	rows = table_size.y;