cpp/openttd-patchpack/source Changeset - r8517:af7145964323

Changeset - r8517:af7145964323

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

belugas - 17 years ago 2008-02-09 03:12:05
belugas@openttd.org

(svn r12092) -Fix(r11532)[FS#1755]: Make sure the production level will not get out of delimited boundaries, while using var result 0D/0E and than multiplying/dividing it.
And use multiply/divide operations instead of shifting. It does the same, just adds a bit more readability

1 file changed with 4 insertions and 4 deletions:

src/industry_cmd.cpp

0 comments (0 inline, 0 general)

src/industry_cmd.cpp

➞

Show inline comments

@@ @@ -2137,7 +2137,7 @@ static void ChangeIndustryProduction(Ind @@
 	/* Increase if needed */
 	while (mul-- != 0 && i->prod_level < PRODLEVEL_MAXIMUM) {
-		i->prod_level <<= 1;
+		i->prod_level = min(i->prod_level * 2, PRODLEVEL_MAXIMUM);
 		i->production_rate[0] = min(i->production_rate[0] * 2, 0xFF);
 		i->production_rate[1] = min(i->production_rate[1] * 2, 0xFF);
 		if (str == STR_NULL) str = indspec->production_up_text;
@@ @@ -2148,9 +2148,9 @@ static void ChangeIndustryProduction(Ind @@
 		if (i->prod_level == PRODLEVEL_MINIMUM) {
 			closeit = true;
 		} else {
 			i->prod_level >>= 1;
 			i->production_rate[0] = (i->production_rate[0] + 1) >> 1;
 			i->production_rate[1] = (i->production_rate[1] + 1) >> 1;
 			i->prod_level = max(i->prod_level / 2, (int)PRODLEVEL_MINIMUM); // typecast to int required to please MSVC
 			i->production_rate[0] = (i->production_rate[0] + 1) / 2;
 			i->production_rate[1] = (i->production_rate[1] + 1) / 2;
 			if (str == STR_NULL) str = indspec->production_down_text;
+		}
+	}

0 comments (0 inline, 0 general)