dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r5653) -Cleanup: Do a little cleanup of the industry gui code.

Browse Source
This commit is contained in:
Darkvater
2006-07-30 14:55:25 +00:00
parent 205c9c227c
commit 93800fc268
1 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
industry_gui.c
View File

@@ -333,33 +333,24 @@ static void IndustryViewWndProc(Window *w, WindowEvent *e)
switch (e->click.widget) { switch (e->click.widget) {
case 5: { case 5: {
int line; int line, x;
int x;
byte b;
i = GetIndustry(w->window_number); i = GetIndustry(w->window_number);
// We should work if needed.. // We should work if needed..
if (!NEED_ALTERB) if (!NEED_ALTERB) return;
return;
x = e->click.pt.x; x = e->click.pt.x;
line = (e->click.pt.y - 127) / 10; 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 (e->click.pt.y >= 127 && IS_INT_INSIDE(line, 0, 2) && i->produced_cargo[line] != CT_INVALID) {
if (IS_INT_INSIDE(x, 5, 25) ) { if (IS_INT_INSIDE(x, 5, 25) ) {
// clicked buttons /* Clicked buttons, decrease or increase production */
if (x < 15) { if (x < 15) {
// decrease i->production_rate[line] = maxu(i->production_rate[line] / 2, 1);
i->production_rate[line] /= 2;
if (i->production_rate[line] < 4)
i->production_rate[line] = 4;
} else { } else {
// increase i->production_rate[line] = minu(i->production_rate[line] * 2, 255);
b = i->production_rate[line] * 2;
if (i->production_rate[line] >= 128)
b=255;
i->production_rate[line] = b;
} }
UpdateIndustryProduction(i); UpdateIndustryProduction(i);
SetWindowDirty(w); SetWindowDirty(w);
w->flags4 |= 5 << WF_TIMEOUT_SHL; w->flags4 |= 5 << WF_TIMEOUT_SHL;
@@ -375,13 +366,12 @@ static void IndustryViewWndProc(Window *w, WindowEvent *e)
w->window_number); w->window_number);
} }
} }
} } break;
break;
case 6: case 6:
i = GetIndustry(w->window_number); i = GetIndustry(w->window_number);
ScrollMainWindowToTile(i->xy + TileDiffXY(1, 1)); ScrollMainWindowToTile(i->xy + TileDiffXY(1, 1));
break; } break;
}
} }
break; break;
case WE_TIMEOUT: case WE_TIMEOUT:
@@ -395,7 +385,7 @@ static void IndustryViewWndProc(Window *w, WindowEvent *e)
Industry* i = GetIndustry(w->window_number); Industry* i = GetIndustry(w->window_number);
int line = WP(w,vp2_d).data_1; 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); UpdateIndustryProduction(i);
SetWindowDirty(w); SetWindowDirty(w);
} }