(svn r11402) -Fix [FS#1382]: incorrect handling of industry behaviour 'must be in town with population large than 1200'
authorglx
Sun, 11 Nov 2007 00:04:52 +0000
changeset 8348 0e073a15c792
parent 8347 af12cf4882ed
child 8349 011e0ee04e43
(svn r11402) -Fix [FS#1382]: incorrect handling of industry behaviour 'must be in town with population large than 1200'
src/industry_cmd.cpp
src/table/build_industry.h
--- a/src/industry_cmd.cpp	Sat Nov 10 23:22:32 2007 +0000
+++ b/src/industry_cmd.cpp	Sun Nov 11 00:04:52 2007 +0000
@@ -1233,7 +1233,7 @@
 				refused_slope |= IsSlopeRefused(tileh, its->slopes_refused);
 			}
 
-			if (ind_behav & INDUSTRYBEH_ONLY_INTOWN) {
+			if (ind_behav & (INDUSTRYBEH_ONLY_INTOWN | INDUSTRYBEH_TOWN1200_MORE)) {
 				if (!IsTileType(cur_tile, MP_HOUSE)) {
 					_error_message = STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS;
 					return false;
--- a/src/table/build_industry.h	Sat Nov 10 23:22:32 2007 +0000
+++ b/src/table/build_industry.h	Sun Nov 11 00:04:52 2007 +0000
@@ -1315,7 +1315,7 @@
 	   CT_VALUABLES,   6, CT_INVALID,       0, 5,
 	   CT_VALUABLES,   0, CT_INVALID,       0, CT_INVALID,     0,
 	   INDUSTRYLIFE_BLACK_HOLE,                1 << LT_TEMPERATE,
-	   INDUSTRYBEH_TOWN1200_MORE | INDUSTRYBEH_ONLY_INTOWN,
+	   INDUSTRYBEH_TOWN1200_MORE,
 	   STR_480E_BANK,                          STR_482D_NEW_UNDER_CONSTRUCTION,
 	   STR_4832_ANNOUNCES_IMMINENT_CLOSURE,    STR_4835_INCREASES_PRODUCTION,     STR_4839_PRODUCTION_DOWN_BY_50),