any_items() -> any_preset_items()
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
@@ -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);
|
||||
|
@@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user