cpp/openttd-patchpack/source Changeset - r7462:2db74bba0fe1

Changeset - r7462:2db74bba0fe1

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

belugas - 17 years ago 2007-08-22 01:16:08
belugas@openttd.org

(svn r10963) -Revert(10700): Although the idea was good, it was more prone of errors than usefull.
So now, it will be better to jump to the overriden tile when it is been marked as an override

3 files changed with 6 insertions and 11 deletions:

src/industry.h

src/industry_cmd.cpp

src/newgrf_industries.cpp

0 comments (0 inline, 0 general)

src/industry.h

➞

Show inline comments

@@ @@ -212,7 +212,7 @@ struct IndustryTileSpec { @@
 /* industry_cmd.cpp*/
 const IndustrySpec *GetIndustrySpec(IndustryType thistype);    ///< Array of industries data
-const IndustryTileSpec *GetIndustryTileSpec(IndustryGfx gfx, bool full_check = true);  ///< Array of industry tiles data
 const IndustryTileSpec *GetIndustryTileSpec(IndustryGfx gfx);  ///< Array of industry tiles data
 void ResetIndustries();
 void PlantRandomFarmField(const Industry *i);

src/industry_cmd.cpp

➞

Show inline comments

@@ @@ -113,19 +113,13 @@ const IndustrySpec *GetIndustrySpec(Indu @@
  * This will ensure at once : proper access and
  * not allowing modifications of it.
  * @param gfx of industrytile (which is the index in _industry_tile_specs)
  * @param full_check (default to true) verify if an override is available.
  *  If so, use it instead of the gfx provided.
  * @pre gfx < INVALID_INDUSTRYTILE
  * @return a pointer to the corresponding industrytile spec
  **/
-const IndustryTileSpec *GetIndustryTileSpec(IndustryGfx gfx, bool full_check)
 const IndustryTileSpec *GetIndustryTileSpec(IndustryGfx gfx)
+{
 	assert(gfx < INVALID_INDUSTRYTILE);
 	const IndustryTileSpec *its = &_industry_tile_specs[gfx];
 	if (full_check && its->grf_prop.override != INVALID_INDUSTRYTILE) {
 		its = &_industry_tile_specs[its->grf_prop.override];
+	}
 	return its;
 	return &_industry_tile_specs[gfx];
+}
 Industry::~Industry()
@@ @@ -334,6 +328,7 @@ static void GetAcceptedCargo_Industry(Ti @@
+{
 	IndustryGfx gfx = GetIndustryGfx(tile);
 	const IndustryTileSpec *itspec = GetIndustryTileSpec(gfx);
 	if (itspec->grf_prop.override != INVALID_INDUSTRYTILE) itspec = GetIndustryTileSpec(itspec->grf_prop.override);
 	/* When we have to use a callback, we put our data in the next two variables */
 	CargoID raw_accepts_cargo[lengthof(itspec->accepts_cargo)];

src/newgrf_industries.cpp

➞

Show inline comments

@@ @@ -87,8 +87,8 @@ uint32 GetIndustryIDAtOffset(TileIndex n @@
 		if (GetIndustryIndex(new_tile) == i->index) {  // Does it belong to the same industry?
 			IndustryGfx gfx = GetIndustryGfx(new_tile);
 			const IndustryTileSpec *indtsp = GetIndustryTileSpec(gfx, false);
 			const IndustryTileSpec *indold = GetIndustryTileSpec(GetIndustryGfx(old_tile), false);
 			const IndustryTileSpec *indtsp = GetIndustryTileSpec(gfx);
 			const IndustryTileSpec *indold = GetIndustryTileSpec(GetIndustryGfx(old_tile));
 			if (gfx < NEW_INDUSTRYOFFSET) {  // Does it belongs to an old type?
 				/* It is an old tile.  We have to see if it's been overriden */

0 comments (0 inline, 0 general)