From a380aa79d90b977a725d9822a5eff79f45df50c9 Mon Sep 17 00:00:00 2001 From: Celtic Minstrel Date: Fri, 14 Aug 2015 23:41:42 -0400 Subject: [PATCH] Since item placement never fails except by random chance, remove error message --- src/scenedit/scen.actions.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/scenedit/scen.actions.cpp b/src/scenedit/scen.actions.cpp index 23f6154d6..2b6ad1b53 100644 --- a/src/scenedit/scen.actions.cpp +++ b/src/scenedit/scen.actions.cpp @@ -2205,7 +2205,6 @@ bool place_item(location spot_hit,short which_item,bool property,bool always,sho void place_items_in_town() { location l; short i,j,k,x; - bool place_failed = false; for(i = 0; i < town->max_dim(); i++) for(j = 0; j < town->max_dim(); j++) { @@ -2215,14 +2214,11 @@ void place_items_in_town() { for(k = 0; k < 10; k++) if(town->terrain(i,j) == scenario.storage_shortcuts[k].ter_type) { for(x = 0; x < 10; x++) - if(place_item(l,scenario.storage_shortcuts[k].item_num[x], - scenario.storage_shortcuts[k].property,false, - scenario.storage_shortcuts[k].item_odds[x]) == false) - place_failed = true; + place_item(l,scenario.storage_shortcuts[k].item_num[x], + scenario.storage_shortcuts[k].property,false, + scenario.storage_shortcuts[k].item_odds[x]); } } - 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(); }