[crawl-ref-commits] jump_attack branch updated: 0.14-a0-82-g52589f2

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

       via  52589f251851356324d7c029974f0c748f50e0c8 (commit)
      from  c4170a9922f5739b4dd3bd3742bb2dfdbe0214ff (commit)

-----------------------------------------------------------------------
commit 52589f251851356324d7c029974f0c748f50e0c8
Author: Neil Moore <ne...@s-...>
Date:   Mon Sep 30 15:11:18 2013 -0400

    Fix ordering of SPARM_* name arrays.

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

Summary of changes:
 crawl-ref/source/mapdef.cc   |    2 +-
 crawl-ref/source/wiz-item.cc |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc
index fa9b08c..a00980e 100644
--- a/crawl-ref/source/mapdef.cc
+++ b/crawl-ref/source/mapdef.cc
@@ -4594,7 +4594,6 @@ static int _str_to_ego(item_spec &spec, string ego_str)
         "intelligence",
         "ponderousness",
         "flying",
-        "jumping",
         "magic_resistance",
         "protection",
         "stealth",
@@ -4605,6 +4604,7 @@ static int _str_to_ego(item_spec &spec, string ego_str)
         "reflection",
         "spirit_shield",
         "archery",
+        "jumping",
         NULL
     };
     COMPILE_CHECK(ARRAYSZ(armour_egos) == NUM_REAL_SPECIAL_ARMOURS);
diff --git a/crawl-ref/source/wiz-item.cc b/crawl-ref/source/wiz-item.cc
index 85a4aad..c768dc6 100644
--- a/crawl-ref/source/wiz-item.cc
+++ b/crawl-ref/source/wiz-item.cc
@@ -1186,7 +1186,6 @@ static void _debug_acquirement_stats(FILE *ostat)
             "intelligence",
             "ponderous",
             "flight",
-            "jumping",
             "magic reistance",
             "protection",
             "stealth",
@@ -1197,6 +1196,7 @@ static void _debug_acquirement_stats(FILE *ostat)
             "reflection",
             "spirit shield",
             "archery",
+            "jumping",
         };
 
         const int non_art = acq_calls - num_arts;


-- 
Dungeon Crawl Stone Soup