openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

any_items() -> any_preset_items()

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-06-11 18:52:57 -05:00
parent 4a8d58926a
commit 161dce6d25
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/scenario/town.cpp
View File

@@ -271,7 +271,7 @@ void cTown::set_item_taken(size_t i, bool val) {
item_taken.set(i, val); item_taken.set(i, val);
} }
bool cTown::any_items() const { bool cTown::any_preset_items() const {
for(cItem item: preset_items){ for(cItem item: preset_items){
if(item.code >= 0) return true; if(item.code >= 0) return true;
} }

2
src/scenario/town.hpp
View File

@@ -115,7 +115,7 @@ public:
void set_up_lights(); void set_up_lights();
short light_obscurity(short x,short y) const; // Obscurity function used for calculating lighting short light_obscurity(short x,short y) const; // Obscurity function used for calculating lighting
bool is_cleaned_out() const; bool is_cleaned_out() const;
bool any_items() const; bool any_preset_items() const;
explicit cTown(cScenario& scenario, size_t dim); explicit cTown(cScenario& scenario, size_t dim);
void import_legacy(legacy::town_record_type& old); void import_legacy(legacy::town_record_type& old);

4
src/scenedit/scen.main.cpp
View File

@@ -694,7 +694,7 @@ void handle_menu_choice(eMenu item_hit) {
change_made = true; change_made = true;
break; break;
case eMenu::TOWN_ITEMS_NOT_PROPERTY:{ case eMenu::TOWN_ITEMS_NOT_PROPERTY:{
if(!town->any_items()){ if(!town->any_preset_items()){
cChoiceDlog("no-items").show(); cChoiceDlog("no-items").show();
break; break;
} }
@@ -716,7 +716,7 @@ void handle_menu_choice(eMenu item_hit) {
change_made = true; change_made = true;
}break; }break;
case eMenu::TOWN_ITEMS_CLEAR:{ case eMenu::TOWN_ITEMS_CLEAR:{
if(!town->any_items()){ if(!town->any_preset_items()){
cChoiceDlog("no-items").show(); cChoiceDlog("no-items").show();
break; break;
} }