Cleaned up shop-handling code considerably.

Instead of shops passing around global id_arr arrays, shops use the newly
added third argument to item_def::name() which indicates whether to
override item ID status.
This means that the shop ID SIGHUP protection is now unnecessary; it's
been removed.
Hopefully I caught all the places where the stash tracker tries to get
item names and fixed them, but I might have missed something.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1359 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 1 insertions, 8 deletions

diff --git a/crawl-ref/source/hiscores.cc b/crawl-ref/source/hiscores.cc
index 09d66dc8fe..47b1f9d68b 100644
--- a/crawl-ref/source/hiscores.cc
+++ b/crawl-ref/source/hiscores.cc
@@ -1063,13 +1063,6 @@ void scorefile_entry::init()
     //if (death_type == KILLED_BY_WINNING) points += points / 2;
     //if (death_type == KILLED_BY_LEAVING) points += points / 10;
     // these now handled by giving player the value of their inventory
-    char temp_id[4][50];
-
-    for (int d = 0; d < 4; d++)
-    {
-        for (int e = 0; e < 50; e++)
-            temp_id[d][e] = 1;
-    }
 
     FixedVector< int, NUM_RUNE_TYPES >  rune_array;
 
@@ -1088,7 +1081,7 @@ void scorefile_entry::init()
         if (is_valid_item( you.inv[d] ))
         {
             if (calc_item_values)
-                points += item_value( you.inv[d], temp_id, true );
+                points += item_value( you.inv[d], true );
 
             if (you.inv[d].base_type == OBJ_MISCELLANY
                 && you.inv[d].sub_type == MISC_RUNE_OF_ZOT)