Mercurial > hg > openttd

changeset 4193:6e37da22295b draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r5653) -Cleanup: Do a little cleanup of the industry gui code.
author Darkvater <Darkvater@openttd.org>
date Sun, 30 Jul 2006 14:55:25 +0000
parents e279c1cf046a
children 037721e8ecd9
files industry_gui.c
diffstat 1 files changed, 10 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/industry_gui.c
+++ b/industry_gui.c
@@ -333,33 +333,24 @@
 
 		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 @@
 							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 @@
 			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);
 		}