(svn r11373) -Fix [FS#1398]: do not even think about building disabled industries.
authorrubidium
Sat, 03 Nov 2007 23:34:12 +0000
changeset 7823 7445cb71f080
parent 7822 dc5f1aa98fe9
child 7824 5a63d41b59ea
(svn r11373) -Fix [FS#1398]: do not even think about building disabled industries.
src/industry_cmd.cpp
--- a/src/industry_cmd.cpp	Sat Nov 03 15:32:07 2007 +0000
+++ b/src/industry_cmd.cpp	Sat Nov 03 23:34:12 2007 +0000
@@ -1784,11 +1784,14 @@
 
 	/* Generate a list of all possible industries that can be built. */
 	for (j = 0; j < NUM_INDUSTRYTYPES; j++) {
-		byte chance = GetIndustrySpec(j)->appear_ingame[_opt.landscape];
+		ind_spc = GetIndustrySpec(j);
+		byte chance = ind_spc->appear_ingame[_opt.landscape];
+
+		if (!ind_spc->enabled || chance == 0) continue;
 
 		/* If there is no Callback CBID_INDUSTRY_AVAILABLE or if this one did anot failed,
 		 * and if appearing chance for this landscape is above 0, this industry can be chosen */
-		if (CheckIfCallBackAllowsAvailability(j, IACT_RANDOMCREATION) && chance != 0) {
+		if (CheckIfCallBackAllowsAvailability(j, IACT_RANDOMCREATION)) {
 			probability_max += chance;
 			/* adds the result for this industry */
 			cumulative_probs[num].ind = j;