cpp/openttd-patchpack/source Changeset - r16440:1bdd98dfbb9e

Changeset - r16440:1bdd98dfbb9e

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

alberth - 14 years ago 2010-11-13 15:02:31
alberth@openttd.org

(svn r21166) -Codechange: Move MaybeNewIndustry() to IndustryBuildData::TryBuildNewIndustry().

2 files changed with 12 insertions and 2 deletions:

src/industry.h

src/industry_cmd.cpp

0 comments (0 inline, 0 general)

src/industry.h

➞

Show inline comments

@@ @@ -143,4 +143,13 @@ void ReleaseDisastersTargetingIndustry(I @@
 #define FOR_ALL_INDUSTRIES_FROM(var, start) FOR_ALL_ITEMS_FROM(Industry, industry_index, var, start)
 #define FOR_ALL_INDUSTRIES(var) FOR_ALL_INDUSTRIES_FROM(var, 0)
 /**
  * Data for managing the number and type of industries in the game.
  */
 struct IndustryBuildData {
 	void TryBuildNewIndustry();
 };
 extern IndustryBuildData _industry_builder;
 #endif /* INDUSTRY_H */

src/industry_cmd.cpp

➞

Show inline comments

@@ @@ -59,6 +59,7 @@ uint16 Industry::counts[NUM_INDUSTRYTYPE @@
 IndustrySpec _industry_specs[NUM_INDUSTRYTYPES];
 IndustryTileSpec _industry_tile_specs[NUM_INDUSTRYTILES];
 IndustryBuildData _industry_builder; ///< In-game manager of industries.
 /**
  * This function initialize the spec arrays of both
@@ @@ -2051,7 +2052,7 @@ struct ProbabilityHelper { @@
 /**
  * Try to create a random industry, during gameplay
  */
-static void MaybeNewIndustry()
+void IndustryBuildData::TryBuildNewIndustry()
+{
 	uint num = 0;
 	ProbabilityHelper cumulative_probs[NUM_INDUSTRYTYPES]; // probability collector
@@ @@ -2454,7 +2455,7 @@ void IndustryDailyLoop() @@
 	for (uint16 j = 0; j < change_loop; j++) {
 		/* 3% chance that we start a new industry */
 		if (Chance16(3, 100)) {
-			MaybeNewIndustry();
+			_industry_builder.TryBuildNewIndustry();
 		} else {
 			Industry *i = Industry::GetRandom();
 			if (i != NULL) {

0 comments (0 inline, 0 general)