From 77398364e73bee6487c9ae0006144d03ba90ada0 Mon Sep 17 00:00:00 2001
From: j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Thu, 14 May 2009 14:34:31 +0000
Subject: Modify ?v to read in the list of changed command keys. Modify version
 highlights.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9765 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/abl-show.cc | 3 ---
 crawl-ref/source/command.cc  | 7 ++-----
 crawl-ref/source/item_use.cc | 9 ++-------
 crawl-ref/source/player.cc   | 2 +-
 4 files changed, 5 insertions(+), 16 deletions(-)

(limited to 'crawl-ref/source')

diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index 1b57c2f05d..d1d3838eac 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -2364,9 +2364,6 @@ void set_god_ability_slots()
     // Finally, add in current god's invocations in traditional slots.
     int num = 0;
 
-//     if (you.religion == GOD_ELYVILON)
-//         _set_god_ability_helper(ABIL_ELYVILON_DESTROY_WEAPONS, 'a' + num++);
-
     for (int i = 0; i < MAX_GOD_ABILITIES; ++i)
     {
         if (god_abilities[you.religion][i] != ABIL_NON_ABILITY)
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index 30bb0eb893..8b07755b10 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -59,8 +59,6 @@ static void _adjust_spells(void);
 static void _adjust_ability(void);
 
 static const char *features[] = {
-    "Stash-tracking",
-
 #ifdef CLUA_BINDINGS
     "Lua user scripts",
 #endif
@@ -106,7 +104,7 @@ static std::string _get_version_information(void)
 #endif
                 result += VERSION_DETAIL ").";
 
-    result += "\n\n";
+    result += "\n";
 
     return (result);
 }
@@ -122,7 +120,6 @@ static std::string _get_version_features(void)
         result += features[i];
         result += EOL;
     }
-    result += "\n";
 
     return (result);
 }
@@ -229,7 +226,7 @@ static void _print_version(void)
     cmd_version.add_text(_get_version_features());
     cmd_version.add_text(_get_version_changes());
 
-    std::string fname = "034_changes.txt";
+    std::string fname = "key_changes.txt";
     // Read in information about changes in comparison to the latest version.
     FILE* fp = fopen(datafile_path(fname, false).c_str(), "r");
 
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index a00ebe3ea4..596e1c7374 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -4963,16 +4963,12 @@ void read_scroll(int slot)
         break;
 
     case SCR_IMMOLATION:
-    {
         mpr("The scroll explodes in your hands!");
-        // We do this here to prevent it from blowing itself up.
-        set_ident_type(scroll, ID_KNOWN_TYPE);
-        dec_inv_item_quantity(item_slot, 1);
 
+        // Doesn't destroy scrolls anymore, so no special check needed. (jpeg)
         immolation(10, IMMOLATION_SCROLL, you.pos(), alreadyknown, &you);
         bad_effect = true;
         break;
-    }
 
     case SCR_CURSE_WEAPON:
         if (!you.weapon()
@@ -5175,8 +5171,7 @@ void read_scroll(int slot)
                                          : ID_TRIED_TYPE);
 
     // Finally, destroy and identify the scroll.
-    // Scrolls of immolation were already destroyed earlier.
-    if (which_scroll != SCR_PAPER && which_scroll != SCR_IMMOLATION)
+    if (which_scroll != SCR_PAPER)
     {
         if (id_the_scroll)
             set_ident_flags(scroll, ISFLAG_KNOW_TYPE); // for notes
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 8f63c80d8e..2aac34031c 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -3950,7 +3950,7 @@ void display_char_status()
     }
 
     _output_expiring_message(DUR_ICY_ARMOUR,
-                             "You are protected by an icy shield.");
+                             "You are protected by an icy armour.");
 
     _output_expiring_message(DUR_REPEL_MISSILES,
                              "You are protected from missiles.");
-- 
cgit v1.2.3-54-g00ecf