gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-04 13:23:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r18416) -Fix (r15559): Only consider valid cargos in town GUI.

Browse Source
This commit is contained in:
frosch 2009-12-06 16:15:58 +00:00
parent a68849fb56
commit 7d905fae22
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/town_gui.cpp
View File

@ -342,6 +342,20 @@ public:
if (widget == TVW_CAPTION) SetDParam(0, this->town->index); if (widget == TVW_CAPTION) SetDParam(0, this->town->index);
} }
/**
* Determines the first cargo with a certain town effect
* @param effect Town effect of interest
* @return first active cargo slot with that effect
*/
const CargoSpec *FindFirstCargoWithTownEffect(TownEffect effect) const
{
const CargoSpec *cs;
FOR_ALL_CARGOSPECS(cs) {
if (cs->town_effect == effect) return cs;
}
return NULL;
}
virtual void DrawWidget(const Rect &r, int widget) const virtual void DrawWidget(const Rect &r, int widget) const
{ {
if (widget != TVW_INFOPANEL) return; if (widget != TVW_INFOPANEL) return;
@ -380,21 +394,13 @@ public:
uint cargo_text_left = r.left + WD_FRAMERECT_LEFT + (rtl ? 0 : 20); uint cargo_text_left = r.left + WD_FRAMERECT_LEFT + (rtl ? 0 : 20);
uint cargo_text_right = r.right - WD_FRAMERECT_RIGHT - (rtl ? 20 : 0); uint cargo_text_right = r.right - WD_FRAMERECT_RIGHT - (rtl ? 20 : 0);
CargoID first_food_cargo = CT_INVALID; const CargoSpec *food = FindFirstCargoWithTownEffect(TE_FOOD);
StringID food_name = STR_CARGO_PLURAL_FOOD; CargoID first_food_cargo = (food != NULL) ? food->Index() : (CargoID)CT_INVALID;
CargoID first_water_cargo = CT_INVALID; StringID food_name = (food != NULL) ? food->name : STR_CARGO_PLURAL_FOOD;
StringID water_name = STR_CARGO_PLURAL_WATER;
for (CargoID cid = 0; cid < NUM_CARGO; cid++) { const CargoSpec *water = FindFirstCargoWithTownEffect(TE_WATER);
const CargoSpec *cs = CargoSpec::Get(cid); CargoID first_water_cargo = (water != NULL) ? water->Index() : (CargoID)CT_INVALID;
if (first_food_cargo == CT_INVALID && cs->town_effect == TE_FOOD) { StringID water_name = (water != NULL) ? water->name : STR_CARGO_PLURAL_WATER;
first_food_cargo = cid;
food_name = cs->name;
}
if (first_water_cargo == CT_INVALID && cs->town_effect == TE_WATER) {
first_water_cargo = cid;
water_name = cs->name;
}
}
if (first_food_cargo != CT_INVALID && this->town->act_food > 0) { if (first_food_cargo != CT_INVALID && this->town->act_food > 0) {
SetDParam(0, first_food_cargo); SetDParam(0, first_food_cargo);