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

DRY item placement

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-06-02 17:12:10 -05:00
parent f4aa9780e0
commit ab3a6d8e7f
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/scenedit/scen.actions.cpp
View File

@@ -2452,7 +2452,11 @@ bool place_item(location spot_hit,short which_item,bool property,bool always,sho
return true; return true;
if(get_ran(1,1,100) > odds) if(get_ran(1,1,100) > odds)
return false; return false;
for(short x = 0; x < town->preset_items.size(); x++) for(short x = 0; x <= town->preset_items.size(); x++){
if(x == town->preset_items.size()){
town->preset_items.resize(x+1);
town->preset_items[x].code = -1;
}
if(town->preset_items[x].code < 0) { if(town->preset_items[x].code < 0) {
town->preset_items[x] = {spot_hit, which_item, scenario.scen_items[which_item]}; town->preset_items[x] = {spot_hit, which_item, scenario.scen_items[which_item]};
town->preset_items[x].contained = container_there(spot_hit); town->preset_items[x].contained = container_there(spot_hit);
@@ -2460,11 +2464,9 @@ bool place_item(location spot_hit,short which_item,bool property,bool always,sho
town->preset_items[x].always_there = always; town->preset_items[x].always_there = always;
return true; return true;
} }
town->preset_items.push_back({spot_hit, which_item, scenario.scen_items[which_item]}); }
town->preset_items.back().contained = container_there(spot_hit); // Shouldn't be reached:
town->preset_items.back().property = property; return false;
town->preset_items.back().always_there = always;
return true;
} }
void place_items_in_town() { void place_items_in_town() {