From 59fc153454c64743725b18f91a875a60f1aae71b Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Tue, 19 Feb 2013 15:43:34 +0000
Subject: [PATCH] [Change] Pulled default colours out of player.* and throw
them in their rightful unit.
---
src/colour.c | 16 ++++++++++++++++
src/colour.h | 17 +++++++++++++++++
src/player.c | 20 +-------------------
3 files changed, 34 insertions(+), 19 deletions(-)
diff --git a/src/colour.c b/src/colour.c
index 8f37e08..b6579e4 100644
--- a/src/colour.c
+++ b/src/colour.c
@@ -17,3 +17,19 @@ glColour cGreen = { .r = 0.20, .g = 0.80, .b = 0.20, .a = 1 };
glColour cDarkRed = { .r = 0.60, .g = 0.10, .b = 0.10, .a = 1 };
glColour cRed = { .r = 0.80, .g = 0.20, .b = 0.20, .a = 1 };
+// Game specific.
+glColour cConsole = { .r = 0.5, .g = 0.8, .b = 0.5, .a = 1. };
+// Objects
+glColour cInert = { .r = 0.6, .g = 0.6, .b = 0.6, .a = 1. };
+glColour cNeutral = { .r = 0.9, .g = 1.0, .b = 0.3, .a = 1. };
+glColour cFriend = { .r = 0.0, .g = 1.0, .b = 0.0, .a = 1. };
+glColour cHostile = { .r = 0.9, .g = 0.2, .b = 0.2, .a = 1. };
+// Radar
+glColour cRadar_player = { .r = 0.4, .g = 0.8, .b = 0.4, .a = 1. };
+glColour cRadar_targ = { .r = 0.0, .g = 0.7, .b = 1.0, .a = 1. };
+glColour cRadar_weap = { .r = 0.8, .g = 0.2, .b = 0.2, .a = 1. };
+// Bars.
+glColour cShield = { .r = 0.2, .g = 0.2, .b = 0.8, .a = 1. };
+glColour cArmour = { .r = 0.5, .g = 0.5, .b = 0.5, .a = 1. };
+glColour cEnergy = { .r = 0.2, .g = 0.8, .b = 0.2, .a = 1. };
+
diff --git a/src/colour.h b/src/colour.h
index fb16e1a..5668e03 100644
--- a/src/colour.h
+++ b/src/colour.h
@@ -11,6 +11,7 @@ extern glColour cWhite;
#define cGrey cGrey70
extern glColour cBlack;
+// Greys
extern glColour cGrey90;
extern glColour cGrey80;
extern glColour cGrey70;
@@ -25,3 +26,19 @@ extern glColour cGreen;
extern glColour cDarkRed;
extern glColour cRed;
+// Game specific.
+extern glColour cConsole;
+// Objects.
+extern glColour cInert;
+extern glColour cNeutral;
+extern glColour cFriend;
+extern glColour cHostile;
+// Radar.
+extern glColour cRadar_player;
+extern glColour cRadar_targ;
+extern glColour cRadar_weap;
+// Health.
+extern glColour cShield;
+extern glColour cArmour;
+extern glColour cEnergy;
+
diff --git a/src/player.c b/src/player.c
index 5bf4c31..cff0e59 100644
--- a/src/player.c
+++ b/src/player.c
@@ -38,24 +38,6 @@ extern Pilot** pilot_stack;
extern int pilots;
// GUI crap.
-
-// -- Colours.
-// Standard colors.
-glColour cConsole = { .r = 0.5, .g = 0.8, .b = 0.5, .a = 1. };
-
-glColour cInert = { .r = 0.6, .g = 0.6, .b = 0.6, .a = 1. };
-glColour cNeutral = { .r = 0.9, .g = 1.0, .b = 0.3, .a = 1. };
-glColour cFriend = { .r = 0.0, .g = 1.0, .b = 0.0, .a = 1. };
-glColour cHostile = { .r = 0.9, .g = 0.2, .b = 0.2, .a = 1. };
-
-glColour cRadar_player = { .r = 0.4, .g = 0.8, .b = 0.4, .a = 1. };
-glColour cRadar_targ = { .r = 0.0, .g = 0.7, .b = 1.0, .a = 1. };
-glColour cRadar_weap = { .r = 0.8, .g = 0.2, .b = 0.2, .a = 1. };
-// Bars.
-glColour cShield = { .r = 0.2, .g = 0.2, .b = 0.8, .a = 1. };
-glColour cArmor = { .r = 0.5, .g = 0.5, .b = 0.5, .a = 1. };
-glColour cEnergy = { .r = 0.2, .g = 0.8, .b = 0.2, .a = 1. };
-
typedef struct {
double x,y; // Position.
double w,h; // Dimensions.
@@ -336,7 +318,7 @@ void player_render(void) {
// Health
gui_renderBar(&cShield, &gui.shield, player->shield / player->shield_max);
- gui_renderBar(&cArmor, &gui.armour, player->armour / player->armour_max);
+ gui_renderBar(&cArmour, &gui.armour, player->armour / player->armour_max);
gui_renderBar(&cEnergy, &gui.energy, player->energy / player->energy_max);
// Weapon.