[crawl-ref-commits] master branch updated: 0.14-a0-68-g331f5bf

[<gi...@cr...>]

       via  331f5bf6f43cb784f7eef76875dfb8eeeda7049c (commit)
       via  3a9d587560d7244ae556378ae272c64c9b586406 (commit)
      from  560282b6d41e0319427228cb1b2c16fe234102e0 (commit)

-----------------------------------------------------------------------
commit 331f5bf6f43cb784f7eef76875dfb8eeeda7049c
Author: Neil Moore <ne...@s-...>
Date:   Mon Sep 30 15:19:53 2013 -0400

    Don't break chaos and evasion brands in mapdefs on major tag bump.

commit 3a9d587560d7244ae556378ae272c64c9b586406
Author: Neil Moore <ne...@s-...>
Date:   Mon Sep 30 15:19:19 2013 -0400

    Add reminder comments about some arrays that parallel enums.

-----------------------------------------------------------------------

Summary of changes:
 crawl-ref/source/enum.h          |    2 ++
 crawl-ref/source/itemprop-enum.h |    3 +++
 crawl-ref/source/mapdef.cc       |    2 ++
 3 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 2a194c6..2cdff8d 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -3073,6 +3073,8 @@ enum pronoun_type
     PRONOUN_OBJECTIVE,
 };
 
+// Be sure to update _prop_name[] in wiz-item.cc to match.  Also
+// _randart_propnames(), but order doesn't matter there.
 enum artefact_prop_type
 {
     ARTP_BRAND,
diff --git a/crawl-ref/source/itemprop-enum.h b/crawl-ref/source/itemprop-enum.h
index 1493987..88f339a 100644
--- a/crawl-ref/source/itemprop-enum.h
+++ b/crawl-ref/source/itemprop-enum.h
@@ -75,6 +75,7 @@ const int SP_FORBID_EGO   = -1;
 const int SP_FORBID_BRAND = -1;
 const int SP_UNKNOWN_BRAND = 31; // seen_weapon/armour is a 32-bit bitfield
 
+// Be sure to update _debug_acquirement_stats and _str_to_ego to match.
 enum brand_type // item_def.special
 {
     SPWPN_FORBID_BRAND = -1,
@@ -335,6 +336,7 @@ enum scroll_type
     NUM_SCROLLS
 };
 
+// Be sure to update _debug_acquirement_stats and _str_to_ego to match.
 enum special_armour_type
 {
     SPARM_FORBID_EGO = -1,
@@ -364,6 +366,7 @@ enum special_armour_type
     NUM_SPECIAL_ARMOURS,
 };
 
+// Be sure to update _str_to_ego to match.
 enum special_missile_type // to separate from weapons in general {dlb}
 {
     SPMSL_FORBID_BRAND = -1,
diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc
index 5e1e972..7769c35 100644
--- a/crawl-ref/source/mapdef.cc
+++ b/crawl-ref/source/mapdef.cc
@@ -4630,7 +4630,9 @@ static int _str_to_ego(item_spec &spec, string ego_str)
         "anti-magic",
         "distortion",
         "reaching",
+#if TAG_MAJOR_VERSION == 34
         "returning",
+#endif
         "chaos",
         "evasion",
 #if TAG_MAJOR_VERSION == 34


-- 
Dungeon Crawl Stone Soup