(svn r11302) -Fix (r9520): typo
authorglx
Fri, 19 Oct 2007 21:14:38 +0000
changeset 7757 3e63b119a5bf
parent 7756 646255a72a89
child 7758 17ad53748c7b
(svn r11302) -Fix (r9520): typo
src/industry.h
src/industry_cmd.cpp
src/newgrf.cpp
--- a/src/industry.h	Fri Oct 19 21:05:25 2007 +0000
+++ b/src/industry.h	Fri Oct 19 21:14:38 2007 +0000
@@ -66,7 +66,7 @@
 	IACT_USERCREATION,    ///< from the Fund/build window
 };
 
-enum IndustyBehaviour {
+enum IndustryBehaviour {
 	INDUSTRYBEH_NONE                  =      0,
 	INDUSTRYBEH_PLANT_FIELDS          = 1 << 0,  ///< periodically plants fileds around itself (temp and artic farms)
 	INDUSTRYBEH_CUT_TREES             = 1 << 1,  ///< cuts trees and produce first output cargo from them (lumber mill)
@@ -90,7 +90,7 @@
 };
 
 
-DECLARE_ENUM_AS_BIT_SET(IndustyBehaviour);
+DECLARE_ENUM_AS_BIT_SET(IndustryBehaviour);
 
 struct Industry;
 DECLARE_OLD_POOL(Industry, Industry, 3, 8000)
@@ -171,7 +171,7 @@
 	uint16 input_cargo_multiplier[3][2];  ///< Input cargo multipliers (multiply amount of incoming cargo for the produced cargos)
 	IndustryLifeType life_type;           ///< This is also known as Industry production flag, in newgrf specs
 	byte climate_availability;            ///< Bitmask, giving landscape enums as bit position
-	IndustyBehaviour behaviour;           ///< How this industry will behave, and how others entities can use it
+	IndustryBehaviour behaviour;           ///< How this industry will behave, and how others entities can use it
 	byte map_colour;                      ///< colour used for the small map
 	StringID name;                        ///< Displayed name of the industry
 	StringID new_industry_text;           ///< Message appearing when the industry is built
--- a/src/industry_cmd.cpp	Fri Oct 19 21:05:25 2007 +0000
+++ b/src/industry_cmd.cpp	Fri Oct 19 21:14:38 2007 +0000
@@ -1007,7 +1007,7 @@
 	if ((i->counter & 0xFF) == 0) {
 		if (HASBIT(indsp->callback_flags, CBM_IND_PRODUCTION_256_TICKS)) IndustryProductionCallback(i, 1);
 
-		IndustyBehaviour indbehav = indsp->behaviour;
+		IndustryBehaviour indbehav = indsp->behaviour;
 		i->produced_cargo_waiting[0] = min(0xffff, i->produced_cargo_waiting[0] + i->production_rate[0]);
 		i->produced_cargo_waiting[1] = min(0xffff, i->produced_cargo_waiting[1] + i->production_rate[1]);
 
@@ -1226,7 +1226,7 @@
 
 			const IndustryTileSpec *its = GetIndustryTileSpec(gfx);
 
-			IndustyBehaviour ind_behav = GetIndustrySpec(type)->behaviour;
+			IndustryBehaviour ind_behav = GetIndustrySpec(type)->behaviour;
 
 			/* Perform land/water check if not disabled */
 			if (!HASBIT(its->slopes_refused, 5) && (IsWaterTile(cur_tile) == !(ind_behav & INDUSTRYBEH_BUILT_ONWATER))) return false;
--- a/src/newgrf.cpp	Fri Oct 19 21:05:25 2007 +0000
+++ b/src/newgrf.cpp	Fri Oct 19 21:14:38 2007 +0000
@@ -2008,7 +2008,7 @@
 				break;
 
 			case 0x1A: // Special industry flags to define special behavior
-				indsp->behaviour = (IndustyBehaviour)grf_load_dword(&buf);
+				indsp->behaviour = (IndustryBehaviour)grf_load_dword(&buf);
 				break;
 
 			case 0x1B: // New industry text ID