summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorglx <glx@openttd.org>2008-05-05 22:42:06 +0000
committerglx <glx@openttd.org>2008-05-05 22:42:06 +0000
commit7da190c1e0265517c18c23c60bf5a4c9a1ee10a1 (patch)
tree5f3a204a83807d5ba50bcc307cbdac085960d6ab /src
parent7f8f70f6f013ffd04592507ef8d042e680b26814 (diff)
downloadopenttd-7da190c1e0265517c18c23c60bf5a4c9a1ee10a1.tar.xz
(svn r12965) -Codechange: add support for callback 37 in industries directory window
Diffstat (limited to 'src')
-rw-r--r--src/industry_gui.cpp5
-rw-r--r--src/lang/english.txt4
2 files changed, 6 insertions, 3 deletions
diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp
index 799d95f36..3fd63712f 100644
--- a/src/industry_gui.cpp
+++ b/src/industry_gui.cpp
@@ -64,6 +64,7 @@ assert_compile(lengthof(_fund_gui.index) == lengthof(_fund_gui.enabled));
enum CargoSuffixType {
CST_FUND,
CST_VIEW,
+ CST_DIR,
};
/**
@@ -806,6 +807,7 @@ static void IndustryDirectoryWndProc(Window *w, WindowEvent *e)
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 @@ static void IndustryDirectoryWndProc(Window *w, WindowEvent *e)
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 @@ static void IndustryDirectoryWndProc(Window *w, WindowEvent *e)
/* 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++;
diff --git a/src/lang/english.txt b/src/lang/english.txt
index 8d11fe3e0..df43978e5 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -1330,8 +1330,8 @@ STR_CONSTRUCT_TOFFEE_QUARRY_TIP :{BLACK}Fund Tof
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