From dd2fcad2a238a271df78aace17a3316f1ec3a940 Mon Sep 17 00:00:00 2001 From: WhiteTreePaladin Date: Sun, 1 Aug 2010 00:33:20 +0000 Subject: [PATCH] Fixed fractional resources showing up in the GUI This was SVN commit r7831. --- .../mods/public/gui/session_new/selection_details.js | 2 +- binaries/data/mods/public/gui/session_new/session.js | 11 ----------- .../data/mods/public/gui/session_new/unit_commands.js | 2 +- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/binaries/data/mods/public/gui/session_new/selection_details.js b/binaries/data/mods/public/gui/session_new/selection_details.js index 6dc1e18f03..707eb6af7b 100644 --- a/binaries/data/mods/public/gui/session_new/selection_details.js +++ b/binaries/data/mods/public/gui/session_new/selection_details.js @@ -89,7 +89,7 @@ function displayGeneralInfo(playerState, entState, template) // Resource stats if (entState.resourceSupply) { - var resources = entState.resourceSupply.amount + "/" + entState.resourceSupply.max + " "; + var resources = Math.ceil(+entState.resourceSupply.amount) + "/" + entState.resourceSupply.max + " "; var resourceType = entState.resourceSupply.type["generic"]; getGUIObjectByName("sdResourceStats").caption = resources; diff --git a/binaries/data/mods/public/gui/session_new/session.js b/binaries/data/mods/public/gui/session_new/session.js index 2962f68d07..7ae7ceb863 100644 --- a/binaries/data/mods/public/gui/session_new/session.js +++ b/binaries/data/mods/public/gui/session_new/session.js @@ -168,17 +168,6 @@ function updatePlayerDisplay(simState) // Utility functions //-------------------------------- -------------------------------- -------------------------------- -function ceiling(number) -{ - var integer = parseInt(number); - var remainder = number - integer; - - if (remainder != 0) - integer++; - - return integer; -} - function toTitleCase(string) { if (string.length > 0) diff --git a/binaries/data/mods/public/gui/session_new/unit_commands.js b/binaries/data/mods/public/gui/session_new/unit_commands.js index 41b4dff1b3..b8916ce1c7 100644 --- a/binaries/data/mods/public/gui/session_new/unit_commands.js +++ b/binaries/data/mods/public/gui/session_new/unit_commands.js @@ -134,7 +134,7 @@ function setupUnitPanel(guiName, usedPanels, unitEntState, items, callback) // Position the visible buttons (TODO: if there's lots, maybe they should be squeezed together to fit) var numButtons = i; var rowLength = 8; - var numRows = ceiling(numButtons / rowLength); + var numRows = Math.ceil(numButtons / rowLength); var buttonSideLength = getGUIObjectByName("unit"+guiName+"Button[0]").size.bottom; var buttonSpacer = ((guiName == "Selection")? buttonSideLength+1 : buttonSideLength+2);