From 161dce6d255e4e58c5f6441e8b07192b9da1e821 Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Wed, 11 Jun 2025 18:52:57 -0500 Subject: [PATCH] any_items() -> any_preset_items() --- src/scenario/town.cpp | 2 +- src/scenario/town.hpp | 2 +- src/scenedit/scen.main.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/scenario/town.cpp b/src/scenario/town.cpp index 76c2ab38..7d22d539 100644 --- a/src/scenario/town.cpp +++ b/src/scenario/town.cpp @@ -271,7 +271,7 @@ void cTown::set_item_taken(size_t i, bool val) { item_taken.set(i, val); } -bool cTown::any_items() const { +bool cTown::any_preset_items() const { for(cItem item: preset_items){ if(item.code >= 0) return true; } diff --git a/src/scenario/town.hpp b/src/scenario/town.hpp index 808b0a48..1811a0b0 100644 --- a/src/scenario/town.hpp +++ b/src/scenario/town.hpp @@ -115,7 +115,7 @@ public: void set_up_lights(); short light_obscurity(short x,short y) const; // Obscurity function used for calculating lighting bool is_cleaned_out() const; - bool any_items() const; + bool any_preset_items() const; explicit cTown(cScenario& scenario, size_t dim); void import_legacy(legacy::town_record_type& old); diff --git a/src/scenedit/scen.main.cpp b/src/scenedit/scen.main.cpp index 1259b162..2aa0d94a 100644 --- a/src/scenedit/scen.main.cpp +++ b/src/scenedit/scen.main.cpp @@ -694,7 +694,7 @@ void handle_menu_choice(eMenu item_hit) { change_made = true; break; case eMenu::TOWN_ITEMS_NOT_PROPERTY:{ - if(!town->any_items()){ + if(!town->any_preset_items()){ cChoiceDlog("no-items").show(); break; } @@ -716,7 +716,7 @@ void handle_menu_choice(eMenu item_hit) { change_made = true; }break; case eMenu::TOWN_ITEMS_CLEAR:{ - if(!town->any_items()){ + if(!town->any_preset_items()){ cChoiceDlog("no-items").show(); break; }