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

Since item placement never fails except by random chance, remove error message

Browse Source
This commit is contained in:
Celtic Minstrel
2015-08-14 23:41:42 -04:00
parent a8b5342704
commit a380aa79d9
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2205,7 +2205,6 @@ bool place_item(location spot_hit,short which_item,bool property,bool always,sho
void place_items_in_town() { void place_items_in_town() {
location l; location l;
short i,j,k,x; short i,j,k,x;
bool place_failed = false;
for(i = 0; i < town->max_dim(); i++) for(i = 0; i < town->max_dim(); i++)
for(j = 0; j < town->max_dim(); j++) { for(j = 0; j < town->max_dim(); j++) {
@@ -2215,14 +2214,11 @@ void place_items_in_town() {
for(k = 0; k < 10; k++) for(k = 0; k < 10; k++)
if(town->terrain(i,j) == scenario.storage_shortcuts[k].ter_type) { if(town->terrain(i,j) == scenario.storage_shortcuts[k].ter_type) {
for(x = 0; x < 10; x++) for(x = 0; x < 10; x++)
if(place_item(l,scenario.storage_shortcuts[k].item_num[x], place_item(l,scenario.storage_shortcuts[k].item_num[x],
scenario.storage_shortcuts[k].property,false, scenario.storage_shortcuts[k].property,false,
scenario.storage_shortcuts[k].item_odds[x]) == false) scenario.storage_shortcuts[k].item_odds[x]);
place_failed = true;
} }
} }
if(place_failed)
showError("Not all of the random items could be placed. The preset item per town limit of 64 was reached.");
draw_terrain(); draw_terrain();
} }