From fa3c8ab7da259d5524aad57d1e30c1d4d3ab49f7 Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Tue, 8 Apr 2014 21:43:23 +0100
Subject: [PATCH] [Fix] Fixed broken handling of health textures.

---
 src/player.c | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/player.c b/src/player.c
index 99cb905..15536b3 100644
--- a/src/player.c
+++ b/src/player.c
@@ -999,10 +999,10 @@ void player_renderGUI(void) {
   }
 
   /* Health */
-  gui_renderHealth(&cShield, &gui.shield, &gui.gfx_shield, player->shield / player->shield_max);
-  gui_renderHealth(&cArmour, &gui.armour, &gui.gfx_armour, player->armour / player->armour_max);
-  gui_renderHealth(&cEnergy, &gui.energy, &gui.gfx_energy, player->energy / player->energy_max);
-  gui_renderHealth(&cFuel,   &gui.fuel,   &gui.gfx_fuel,   player->fuel   / player->fuel_max);
+  gui_renderHealth(&cShield, &gui.shield, gui.gfx_shield, player->shield / player->shield_max);
+  gui_renderHealth(&cArmour, &gui.armour, gui.gfx_armour, player->armour / player->armour_max);
+  gui_renderHealth(&cEnergy, &gui.energy, gui.gfx_energy, player->energy / player->energy_max);
+  gui_renderHealth(&cFuel,   &gui.fuel,   gui.gfx_fuel,   player->fuel   / player->fuel_max);
 
   /* Weapon. */
   if(player->secondary == NULL) {
@@ -1484,31 +1484,42 @@ static int gui_parse(const xmlNodePtr parent, const char* name) {
           rect_parse(cur, &gui.shield.x, &gui.shield.y,
                      &gui.shield.w, &gui.shield.h);
           tmp = xml_get(cur);
-          if(tmp != NULL)
-            gui.gfx_shield = gl_newImage(tmp);
+          if(tmp != NULL) {
+            snprintf(buf, PATH_MAX, GUI_GFX"%s.png", tmp);
+            gui.gfx_shield = gl_newImage(buf);
+          }
           RELATIVIZE(gui.shield);
         }
 
         if(xml_isNode(cur, "armour")) {
           rect_parse(cur, &gui.armour.x, &gui.armour.y,
                      &gui.armour.w, &gui.armour.h);
-          if(tmp != NULL)
-            gui.gfx_armour = gl_newImage(tmp);
+          tmp = xml_get(cur);
+          if(tmp != NULL) {
+            snprintf(buf, PATH_MAX, GUI_GFX"%s.png", tmp);
+            gui.gfx_armour = gl_newImage(buf);
+          }
           RELATIVIZE(gui.armour);
         }
 
         if(xml_isNode(cur, "energy")) {
           rect_parse(cur, &gui.energy.x, &gui.energy.y,
                      &gui.energy.w, &gui.energy.h);
-          if(tmp != NULL)
-            gui.gfx_energy = gl_newImage(tmp);
+          tmp = xml_get(cur);
+          if(tmp != NULL) {
+            snprintf(buf, PATH_MAX, GUI_GFX"%s.png", tmp);
+            gui.gfx_energy = gl_newImage(buf);
+          }
           RELATIVIZE(gui.energy);
         }
         if(xml_isNode(cur, "fuel")) {
           rect_parse(cur, &gui.fuel.x, &gui.fuel.y,
               &gui.fuel.w, &gui.fuel.h);
-          if(tmp != NULL)
-            gui.gfx_fuel = gl_newImage(tmp);
+          tmp = xml_get(cur);
+          if(tmp != NULL) {
+            snprintf(buf, PATH_MAX, GUI_GFX"%s.png", tmp);
+            gui.gfx_fuel = gl_newImage(buf);
+          }
           RELATIVIZE(gui.fuel);
         }
       } while((cur = cur->next));