(svn r12965) -Codechange: add support for callback 37 in industries directory window
--- a/src/industry_gui.cpp Mon May 05 22:37:40 2008 +0000
+++ b/src/industry_gui.cpp Mon May 05 22:42:06 2008 +0000
@@ -64,6 +64,7 @@
enum CargoSuffixType {
CST_FUND,
CST_VIEW,
+ CST_DIR,
};
/**
@@ -806,6 +807,7 @@
while (pos < _num_industry_sort) {
const Industry* i = _industry_sort[pos];
+ const IndustrySpec *indsp = GetIndustrySpec(i->type);
byte p = 0;
/* Industry name */
@@ -816,6 +818,7 @@
if (i->produced_cargo[j] == CT_INVALID) continue;
SetDParam(p++, i->produced_cargo[j]);
SetDParam(p++, i->last_month_production[j]);
+ SetDParam(p++, GetCargoSuffix(j + 3, CST_DIR, (Industry*)i, i->type, indsp));
}
/* Transported productions */
@@ -826,7 +829,7 @@
/* Drawing the right string */
StringID str = STR_INDUSTRYDIR_ITEM_NOPROD;
- if (p != 1) str = (p == 4) ? STR_INDUSTRYDIR_ITEM : STR_INDUSTRYDIR_ITEM_TWO;
+ if (p != 1) str = (p == 5) ? STR_INDUSTRYDIR_ITEM : STR_INDUSTRYDIR_ITEM_TWO;
DrawString(4, 28 + n * 10, str, TC_FROMSTRING);
pos++;
--- a/src/lang/english.txt Mon May 05 22:37:40 2008 +0000
+++ b/src/lang/english.txt Mon May 05 22:42:06 2008 +0000
@@ -1330,8 +1330,8 @@
STR_CONSTRUCT_SUGAR_MINE_TIP :{BLACK}Construct Sugar Mine
STR_INDUSTRYDIR_CAPTION :{WHITE}Industries
-STR_INDUSTRYDIR_ITEM :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}){YELLOW} ({COMMA}% transported)
-STR_INDUSTRYDIR_ITEM_TWO :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}/{CARGO}){YELLOW} ({COMMA}%/{COMMA}% transported)
+STR_INDUSTRYDIR_ITEM :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transported)
+STR_INDUSTRYDIR_ITEM_TWO :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transported)
STR_INDUSTRYDIR_ITEM_NOPROD :{ORANGE}{INDUSTRY}
STR_INDUSTRY_TOO_CLOSE :{WHITE}...too close to another industry