From 9304ae6cc3684377e50e6fcbc3d13e80fa092b6a Mon Sep 17 00:00:00 2001 From: haranp Date: Tue, 24 Apr 2007 22:38:41 +0000 Subject: 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 --- crawl-ref/source/stash.h | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'crawl-ref/source/stash.h') diff --git a/crawl-ref/source/stash.h b/crawl-ref/source/stash.h index c384041191..2a8becbce6 100644 --- a/crawl-ref/source/stash.h +++ b/crawl-ref/source/stash.h @@ -140,7 +140,7 @@ private: // Messy! struct shop_item { - item_def item; + item_def item; unsigned price; }; std::vector items; @@ -148,16 +148,6 @@ private: std::string shop_item_name(const shop_item &si) const; std::string shop_item_desc(const shop_item &si) const; void describe_shop_item(const shop_item &si) const; - - class ShopId : public shopping_hup_protect - { - public: - ShopId(int stype); - ~ShopId(); - private: - int shoptype; - id_fix_arr id; - }; }; struct stash_search_result -- cgit v1.2.3-54-g00ecf