diff --git a/simutrans/trunk/gui/city_info.cc b/simutrans/trunk/gui/city_info.cc index 879ea8e0d..adec862cb 100644 --- a/simutrans/trunk/gui/city_info.cc +++ b/simutrans/trunk/gui/city_info.cc @@ -34,7 +34,7 @@ const char *hist_type[MAX_CITY_HISTORY] = { "citicens", "Growth", "Buildings", "Verkehrsteilnehmer", "Transported", "walking", "Passagiere", "sended", "directmail", "Post", - "Arrived", "Goods", "Electricity" + "unused Arrived", "Supplied Factrs", "unused Electricity" }; @@ -70,6 +70,9 @@ city_info_t::city_info_t(stadt_t* city) : allow_growth.add_listener( this ); add_component(&allow_growth); + // turn off unused charts + city->stadtinfo_options &= ~( (1<get_last_year()); chart.set_background(SYSCOL_CHART_BACKGROUND); - for( uint32 i = 0; iget_city_history_year(), MAX_CITY_HISTORY, i, 12, STANDARD, (city->stadtinfo_options & (1<stadtinfo_options & (1<get_city_history_month(), MAX_CITY_HISTORY, i, 12, STANDARD, (city->stadtinfo_options & (1<stadtinfo_options & (1<stadtinfo_options & (1<get_pax_destinations_new_change(); const int window_height = D_TITLEBAR_HEIGHT + D_MARGIN_TOP + D_BUTTON_HEIGHT + D_V_SPACE + @@ -279,6 +291,14 @@ void city_info_t::draw(scr_coord pos, scr_size size) { stadt_t* const c = city; + // update ratios + for(uint i=0; iget_finance_history_month(i, HIST_GOODS_RECEIVED)*10000) / max( c->get_finance_history_month(i, HIST_GOODS_NEEDED), 1); + } + for(uint i=0; iget_finance_history_year(i, HIST_GOODS_RECEIVED)*10000) / max( c->get_finance_history_year(i, HIST_GOODS_NEEDED), 1); + } + // Hajo: update chart seed chart.set_seed(welt->get_last_year()); diff --git a/simutrans/trunk/gui/city_info.h b/simutrans/trunk/gui/city_info.h index 62e183c85..e72b06dd9 100644 --- a/simutrans/trunk/gui/city_info.h +++ b/simutrans/trunk/gui/city_info.h @@ -59,6 +59,9 @@ private: /// e.g. when losing focus void reset_city_name(); + sint64 supplied_ratio_month[MAX_CITY_HISTORY_MONTHS]; + sint64 supplied_ratio_year[MAX_CITY_HISTORY_YEARS]; + public: city_info_t(stadt_t *city);