From ad006788c5f6d6354e925d89b409c6b61b8b5665 Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Fri, 15 Feb 2013 02:22:35 +0000
Subject: [PATCH] [Fix] Oops. Forgot to run that hack on header and text
 files..

---
 scripts/ai/API | 8 ++++----
 src/outfit.h   | 4 ++--
 src/pilot.h    | 8 ++++----
 src/ship.h     | 2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/scripts/ai/API b/scripts/ai/API
index a2a7a55..fc2caf3 100644
--- a/scripts/ai/API
+++ b/scripts/ai/API
@@ -53,14 +53,14 @@ minbrakedist()
   -- Returns the minimum required braking distance assuming all goes well.
     -- return number distance needed to brake.
 
-armor([number pilot])
-  -- Returns the total amount of armor left.
+armour([number pilot])
+  -- Returns the total amount of armour left.
 
 shield()
   -- Returns the total amount of shield left.
 
-parmor()
-  -- Returns the percentage of armor remaining.
+parmour()
+  -- Returns the percentage of armour remaining.
     -- pilot - Optional pilot id, if not the current pilot is used.
 
 pshield()
diff --git a/src/outfit.h b/src/outfit.h
index 18d41f9..d1f93aa 100644
--- a/src/outfit.h
+++ b/src/outfit.h
@@ -42,7 +42,7 @@ typedef struct {
       double speed; // Speed of shot. (not applicable to beam.
       double range;
       double accuracy; // Desviation accuracy.
-      double damage_armor, damage_shield; // Damage.
+      double damage_armour, damage_shield; // Damage.
 
       gl_texture* gfx_space;
     };
@@ -53,7 +53,7 @@ typedef struct {
       //double speed; // Max speed.
       //double turn; // Turn vel.
       //double thrust; // Acceleration.
-      //double damage_armor, damage_shield;
+      //double damage_armour, damage_shield;
 
       //gl_texture* gfx_space;
     };
diff --git a/src/pilot.h b/src/pilot.h
index ab80589..007b9a8 100644
--- a/src/pilot.h
+++ b/src/pilot.h
@@ -10,7 +10,7 @@
 
 // Aproximation for pilot size.
 #define PILOT_SIZE_APROX     0.8
-#define PILOT_DISABLED_ARMOR 0.2 // Based on armor percentage.
+#define PILOT_DISABLED_ARMOR 0.2 // Based on armour percentage.
 
 // Flags.
 #define pilot_isFlag(p,f)   (p->flags & f)
@@ -44,8 +44,8 @@ typedef struct Pilot {
   Solid* solid;   // Associated solid (physics).
 
   // Current health.
-  double armor, shield, energy;
-  double armor_max, shield_max, energy_max;
+  double armour, shield, energy;
+  double armour_max, shield_max, energy_max;
 
   void (*think)(struct Pilot*); // AI thinking for the pilot.
   void (*update)(struct Pilot*, const double); // Update the pilot.
@@ -91,7 +91,7 @@ Fleet* fleet_get(const char* name);
 
 // MISC.
 void pilot_shoot(Pilot* p, const int secondary);
-void pilot_hit(Pilot* p, const double damage_shield, const double damage_armor);
+void pilot_hit(Pilot* p, const double damage_shield, const double damage_armour);
 
 // Creation.
 void pilot_init(Pilot* dest, Ship* ship, char* name, Faction* faction, AI_Profile* ai,
diff --git a/src/ship.h b/src/ship.h
index 9454c3a..7f9813a 100644
--- a/src/ship.h
+++ b/src/ship.h
@@ -42,7 +42,7 @@ typedef struct {
   int mass;
 
   // Health.
-  double armor, armor_regen;
+  double armour, armour_regen;
   double shield, shield_regen;
   double energy, energy_regen;