src/graph_gui.cpp
branchNewGRF_ports
changeset 6870 ca3fd1fbe311
parent 6743 cabfaa4a0295
child 6871 5a9dc001e1ad
child 9722 ebf0ece7d8f6
--- a/src/graph_gui.cpp	Thu Sep 06 19:42:48 2007 +0000
+++ b/src/graph_gui.cpp	Sat Oct 06 21:16:00 2007 +0000
@@ -1006,13 +1006,7 @@
 				DrawStringRightAligned(107, y, SET_PERFORMANCE_DETAIL_INT, 0);
 
 				/* Calculate the %-bar */
-				if (val > needed) {
-					x = 50;
-				} else if (val == 0) {
-					x = 0;
-				} else {
-					x = val * 50 / needed;
-				}
+				x = clamp(val, 0, needed) * 50 / needed;
 
 				/* SCORE_LOAN is inversed */
 				if (val < 0 && i == SCORE_LOAN) x = 0;
@@ -1022,7 +1016,7 @@
 				if (x != 50) GfxFillRect(112 + x, y - 2, 112 + 50, y + 10, color_notdone);
 
 				/* Calculate the % */
-				x = (val <= needed) ? val * 100 / needed : 100;
+				x = clamp(val, 0, needed) * 100 / needed;
 
 				/* SCORE_LOAN is inversed */
 				if (val < 0 && i == SCORE_LOAN) x = 0;