From e320e6ae2fdaad35331fcd4a610d1d5fb61b600e Mon Sep 17 00:00:00 2001
From: dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Sun, 3 Feb 2008 06:22:38 +0000
Subject: [1885302] Use commonwealth "defence" instead of "defense".

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3389 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/debug.cc    | 4 ++--
 crawl-ref/source/decks.cc    | 4 ++--
 crawl-ref/source/decks.h     | 2 +-
 crawl-ref/source/itemname.cc | 4 ++--
 crawl-ref/source/itemprop.h  | 2 +-
 crawl-ref/source/libgui.cc   | 2 +-
 crawl-ref/source/tile1.cc    | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'crawl-ref')

diff --git a/crawl-ref/source/debug.cc b/crawl-ref/source/debug.cc
index 18856e9122..40c9214223 100644
--- a/crawl-ref/source/debug.cc
+++ b/crawl-ref/source/debug.cc
@@ -803,7 +803,7 @@ static void deck_from_specs(const char* _specs, item_def &item)
         MISC_DECK_OF_PUNISHMENT,
         MISC_DECK_OF_WAR,
         MISC_DECK_OF_CHANGES,
-        MISC_DECK_OF_DEFENSE,
+        MISC_DECK_OF_DEFENCE,
         NUM_MISCELLANY
     };
 
@@ -834,7 +834,7 @@ static void deck_from_specs(const char* _specs, item_def &item)
 "[a] escape     [b] destruction [c] dungeons [d] summoning [e] wonders",
                 MSGCH_PROMPT);
             mpr(
-"[f] punishment [g] war         [h] changes  [i] defense",
+"[f] punishment [g] war         [h] changes  [i] defence",
                 MSGCH_PROMPT);
             mpr("Which deck (ESC to exit)? ");
 
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index 7442c46ba4..8e1e5eacec 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -340,7 +340,7 @@ static const deck_archetype* random_sub_deck(unsigned char deck_type)
         case 2: pdeck = deck_of_wonders;      break;
         }
         break;
-    case MISC_DECK_OF_DEFENSE:
+    case MISC_DECK_OF_DEFENCE:
         pdeck = (coinflip() ? deck_of_emergency : deck_of_battle);
         break;
     }
@@ -2640,7 +2640,7 @@ bool is_deck(const item_def &item)
 {
     return item.base_type == OBJ_MISCELLANY
         && (item.sub_type >= MISC_DECK_OF_ESCAPE &&
-            item.sub_type <= MISC_DECK_OF_DEFENSE);
+            item.sub_type <= MISC_DECK_OF_DEFENCE);
 }
 
 bool bad_deck(const item_def &item)
diff --git a/crawl-ref/source/decks.h b/crawl-ref/source/decks.h
index 4846db677e..2f521ef89b 100644
--- a/crawl-ref/source/decks.h
+++ b/crawl-ref/source/decks.h
@@ -79,7 +79,7 @@ enum card_type
     CARD_ELIXIR,                // healing
     CARD_BATTLELUST,            // melee boosts
     CARD_METAMORPHOSIS,         // transformation
-    CARD_HELM,                  // defense
+    CARD_HELM,                  // defence
     CARD_BLADE,                 // weapon boosts
     CARD_SHADOW,                // assassin skills
 
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index df0badb632..272e2ab091 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -730,7 +730,7 @@ static const char* misc_type_name(int type, bool known)
         case MISC_DECK_OF_PUNISHMENT: return "deck of punishment";
         case MISC_DECK_OF_WAR: return "deck of war";
         case MISC_DECK_OF_CHANGES: return "deck of changes";
-        case MISC_DECK_OF_DEFENSE: return "deck of defense";
+        case MISC_DECK_OF_DEFENCE: return "deck of defence";
 
         case MISC_CRYSTAL_BALL_OF_ENERGY: return "crystal ball of energy";
         case MISC_CRYSTAL_BALL_OF_FIXATION: return "crystal ball of fixation";
@@ -763,7 +763,7 @@ static const char* misc_type_name(int type, bool known)
         case MISC_DECK_OF_PUNISHMENT:
         case MISC_DECK_OF_WAR:
         case MISC_DECK_OF_CHANGES:
-        case MISC_DECK_OF_DEFENSE:
+        case MISC_DECK_OF_DEFENCE:
             return "deck of cards";
         case MISC_CRYSTAL_BALL_OF_ENERGY:
         case MISC_CRYSTAL_BALL_OF_FIXATION:
diff --git a/crawl-ref/source/itemprop.h b/crawl-ref/source/itemprop.h
index 499880011c..6b98fbebe3 100644
--- a/crawl-ref/source/itemprop.h
+++ b/crawl-ref/source/itemprop.h
@@ -244,7 +244,7 @@ enum misc_item_type
     // mixed decks
     MISC_DECK_OF_WAR,
     MISC_DECK_OF_CHANGES,
-    MISC_DECK_OF_DEFENSE,
+    MISC_DECK_OF_DEFENCE,
 
     MISC_RUNE_OF_ZOT,
 
diff --git a/crawl-ref/source/libgui.cc b/crawl-ref/source/libgui.cc
index ba8f295192..d47f6a6b04 100644
--- a/crawl-ref/source/libgui.cc
+++ b/crawl-ref/source/libgui.cc
@@ -1340,7 +1340,7 @@ static int handle_mouse_motion(int mouse_x, int mouse_y, bool init)
                             break;
                         case OBJ_MISCELLANY + 18:
                             if (you.inv[ix].sub_type >= MISC_DECK_OF_ESCAPE
-                                && you.inv[ix].sub_type <= MISC_DECK_OF_DEFENSE)
+                                && you.inv[ix].sub_type <= MISC_DECK_OF_DEFENCE)
                             {
                                 desc += "Draw a card (E)";
                                 break;
diff --git a/crawl-ref/source/tile1.cc b/crawl-ref/source/tile1.cc
index 52877d622f..413f93908e 100644
--- a/crawl-ref/source/tile1.cc
+++ b/crawl-ref/source/tile1.cc
@@ -1488,7 +1488,7 @@ int tileidx_misc(const item_def &item)
     case MISC_DECK_OF_PUNISHMENT:
     case MISC_DECK_OF_WAR:
     case MISC_DECK_OF_CHANGES:
-    case MISC_DECK_OF_DEFENSE:
+    case MISC_DECK_OF_DEFENCE:
         switch (item.special)
         {
         case DECK_RARITY_LEGENDARY:
@@ -2715,7 +2715,7 @@ int tilep_equ_weapon(const item_def &item)
         case MISC_DECK_OF_PUNISHMENT:
         case MISC_DECK_OF_WAR:
         case MISC_DECK_OF_CHANGES:
-        case MISC_DECK_OF_DEFENSE: return TILEP_HAND1_DECK;
+        case MISC_DECK_OF_DEFENCE: return TILEP_HAND1_DECK;
         }
     }
 
-- 
cgit v1.2.3-54-g00ecf