diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-11-27 07:30:18 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-11-27 07:30:18 +0000 |
| commit | 784109076e959d4ef6432035199c712b38f08dc1 (patch) | |
| tree | ee5451578f48595ee04fd9414b40ec0f10366121 | |
| parent | d131ce057a429833e086b60cebeda46e062d07a1 (diff) | |
| download | crawl-ref-784109076e959d4ef6432035199c712b38f08dc1.tar.gz crawl-ref-784109076e959d4ef6432035199c712b38f08dc1.zip | |
Fixed hiding of draw_item() in derived classes of Menu.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@496 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/files.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/menu.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/menu.h | 4 |
3 files changed, 5 insertions, 8 deletions
diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc index d27bfad7ce..3ee001c3ed 100644 --- a/crawl-ref/source/files.cc +++ b/crawl-ref/source/files.cc @@ -85,9 +85,6 @@ void save_level(int level_saved, bool was_a_labyrinth, char where_were_you); -// temp file pairs used for file level cleanup -extern FixedArray < bool, MAX_LEVELS, MAX_BRANCHES > tmp_file_pairs; - /* Order for looking for conjurations for the 1st & 2nd spell slots, when finding spells to be remembered by a player's ghost: diff --git a/crawl-ref/source/menu.cc b/crawl-ref/source/menu.cc index 204ffc5b3a..7125555e7a 100644 --- a/crawl-ref/source/menu.cc +++ b/crawl-ref/source/menu.cc @@ -506,10 +506,10 @@ void Menu::draw_item( int index ) const return; gotoxy( 1, y_offset + index - first_entry ); - draw_item(index, items[index]); + draw_index_item(index, items[index]); } -void Menu::draw_item(int index, const MenuEntry *me) const +void Menu::draw_index_item(int index, const MenuEntry *me) const { if (f_drawitem) (*f_drawitem)(index, me); @@ -1221,7 +1221,7 @@ formatted_scroller::formatted_scroller(int _flags, const std::string& s) : } } -void formatted_scroller::draw_item(int index, const MenuEntry *me) const +void formatted_scroller::draw_index_item(int index, const MenuEntry *me) const { formatted_string::parse_string(me->text).display(); } diff --git a/crawl-ref/source/menu.h b/crawl-ref/source/menu.h index d002912383..1b01fa1273 100644 --- a/crawl-ref/source/menu.h +++ b/crawl-ref/source/menu.h @@ -292,7 +292,7 @@ protected: void do_menu(); virtual void draw_select_count(int count, bool force = false); virtual void draw_item( int index ) const; - virtual void draw_item(int index, const MenuEntry *me) const; + virtual void draw_index_item(int index, const MenuEntry *me) const; virtual void draw_stock_item(int index, const MenuEntry *me) const; virtual void draw_title(); @@ -409,7 +409,7 @@ class formatted_scroller : public Menu public: formatted_scroller(int flags, const std::string& s); protected: - virtual void draw_item(int index, const MenuEntry* me) const; + virtual void draw_index_item(int index, const MenuEntry* me) const; }; int menu_colour(const std::string &itemtext); |