summaryrefslogtreecommitdiff
path: root/industry_gui.c
diff options
context:
space:
mode:
authorDarkvater <darkvater@openttd.org>2006-07-30 14:55:25 +0000
committerDarkvater <darkvater@openttd.org>2006-07-30 14:55:25 +0000
commit93800fc268d406da66a3d96c92a82cd5259d6448 (patch)
tree573111416facac923e6d1644d774ecf45536c9e9 /industry_gui.c
parent205c9c227cf8201900cc26b055b99906df6a87cb (diff)
downloadopenttd-93800fc268d406da66a3d96c92a82cd5259d6448.tar.xz
(svn r5653) -Cleanup: Do a little cleanup of the industry gui code.
Diffstat (limited to 'industry_gui.c')
-rw-r--r--industry_gui.c30
1 files changed, 10 insertions, 20 deletions
diff --git a/industry_gui.c b/industry_gui.c
index 6c45678b3..de62b0b5b 100644
--- a/industry_gui.c
+++ b/industry_gui.c
@@ -333,33 +333,24 @@ static void IndustryViewWndProc(Window *w, WindowEvent *e)
switch (e->click.widget) {
case 5: {
- int line;
- int x;
- byte b;
+ int line, x;
i = GetIndustry(w->window_number);
// We should work if needed..
- if (!NEED_ALTERB)
- return;
+ if (!NEED_ALTERB) return;
x = e->click.pt.x;
line = (e->click.pt.y - 127) / 10;
if (e->click.pt.y >= 127 && IS_INT_INSIDE(line, 0, 2) && i->produced_cargo[line] != CT_INVALID) {
if (IS_INT_INSIDE(x, 5, 25) ) {
- // clicked buttons
+ /* Clicked buttons, decrease or increase production */
if (x < 15) {
- // decrease
- i->production_rate[line] /= 2;
- if (i->production_rate[line] < 4)
- i->production_rate[line] = 4;
+ i->production_rate[line] = maxu(i->production_rate[line] / 2, 1);
} else {
- // increase
- b = i->production_rate[line] * 2;
- if (i->production_rate[line] >= 128)
- b=255;
- i->production_rate[line] = b;
+ i->production_rate[line] = minu(i->production_rate[line] * 2, 255);
}
+
UpdateIndustryProduction(i);
SetWindowDirty(w);
w->flags4 |= 5 << WF_TIMEOUT_SHL;
@@ -375,13 +366,12 @@ static void IndustryViewWndProc(Window *w, WindowEvent *e)
w->window_number);
}
}
- }
- break;
+ } break;
case 6:
i = GetIndustry(w->window_number);
ScrollMainWindowToTile(i->xy + TileDiffXY(1, 1));
- break;
- }
+ } break;
+
}
break;
case WE_TIMEOUT:
@@ -395,7 +385,7 @@ static void IndustryViewWndProc(Window *w, WindowEvent *e)
Industry* i = GetIndustry(w->window_number);
int line = WP(w,vp2_d).data_1;
- i->production_rate[line] = clamp(atoi(e->edittext.str), 32, 2040) / 8;
+ i->production_rate[line] = clampu(atoi(e->edittext.str), 0, 255);
UpdateIndustryProduction(i);
SetWindowDirty(w);
}