cpp/openttd-patchpack/source Changeset - r17833:6e30fcc94ba8

Changeset - r17833:6e30fcc94ba8

Parent rev.

Child rev.

[Not reviewed]

master

0 13 0

frosch - 13 years ago 2011-07-04 20:31:57
frosch@openttd.org

(svn r22634) -Codechange: Deduplicate some code. Note that zeroing 'count' is intentionally removed, it is only used together with 'scope'.

13 files changed with 27 insertions and 48 deletions:

src/newgrf_airport.cpp

src/newgrf_airporttiles.cpp

src/newgrf_canal.cpp

src/newgrf_cargo.cpp

src/newgrf_engine.cpp

src/newgrf_generic.cpp

src/newgrf_house.cpp

src/newgrf_industries.cpp

src/newgrf_industrytiles.cpp

src/newgrf_object.cpp

src/newgrf_railtype.cpp

src/newgrf_spritegroup.h

src/newgrf_station.cpp

0 comments (0 inline, 0 general)

src/newgrf_airport.cpp

➞

Show inline comments

@@ @@ -221,16 +221,13 @@ static void NewAirportResolver(ResolverO @@
 	res->u.airport.layout     = layout;
 	res->u.airport.tile       = tile;
 	res->callback        = CBID_NO_CALLBACK;
 	res->callback_param1 = 0;
 	res->callback_param2 = 0;
 	res->last_value      = 0;
 	res->trigger         = 0;
 	res->reseed          = 0;
 	res->count           = 0;
 	res->ResetState();
 	const AirportSpec *as = AirportSpec::Get(airport_id);
 	res->grffile         = as->grf_prop.grffile;
+}
 SpriteID GetCustomAirportSprite(const AirportSpec *as, byte layout)

src/newgrf_airporttiles.cpp

➞

Show inline comments

@@ @@ -235,16 +235,13 @@ static void AirportTileResolver(Resolver @@
 	res->u.airport.st         = st;
 	res->u.airport.tile       = tile;
 	res->callback        = CBID_NO_CALLBACK;
 	res->callback_param1 = 0;
 	res->callback_param2 = 0;
 	res->last_value      = 0;
 	res->trigger         = 0;
 	res->reseed          = 0;
 	res->count           = 0;
 	res->ResetState();
 	res->grffile         = ats->grf_prop.grffile;
+}
 uint16 GetAirportTileCallback(CallbackID callback, uint32 param1, uint32 param2, const AirportTileSpec *ats, Station *st, TileIndex tile)
+{

src/newgrf_canal.cpp

➞

Show inline comments

@@ @@ -86,16 +86,14 @@ static void NewCanalResolver(ResolverObj @@
 	res->u.canal.tile = tile;
 	res->callback        = CBID_NO_CALLBACK;
 	res->callback_param1 = 0;
 	res->callback_param2 = 0;
 	res->last_value      = 0;
 	res->trigger         = 0;
 	res->reseed          = 0;
 	res->count           = 0;
 	res->ResetState();
 	res->grffile         = grffile;
+}
 /**
  * Lookup the base sprite to use for a canal.

src/newgrf_cargo.cpp

➞

Show inline comments

@@ @@ -63,16 +63,14 @@ static void NewCargoResolver(ResolverObj @@
 	res->u.cargo.cs = cs;
 	res->callback        = CBID_NO_CALLBACK;
 	res->callback_param1 = 0;
 	res->callback_param2 = 0;
 	res->last_value      = 0;
 	res->trigger         = 0;
 	res->reseed          = 0;
 	res->count           = 0;
 	res->ResetState();
 	res->grffile         = cs->grffile;
+}
 SpriteID GetCustomCargoSprite(const CargoSpec *cs)
+{

src/newgrf_engine.cpp

➞

Show inline comments

@@ @@ -875,16 +875,13 @@ static inline void NewVehicleResolver(Re @@
 	res->u.vehicle.self_type = engine_type;
 	res->u.vehicle.info_view = false;
 	res->callback        = CBID_NO_CALLBACK;
 	res->callback_param1 = 0;
 	res->callback_param2 = 0;
 	res->last_value      = 0;
 	res->trigger         = 0;
 	res->reseed          = 0;
 	res->count           = 0;
 	res->ResetState();
 	const Engine *e = Engine::Get(engine_type);
 	res->grffile         = (e != NULL ? e->grf_prop.grffile : NULL);
+}

src/newgrf_generic.cpp

➞

Show inline comments

@@ @@ -123,16 +123,14 @@ static inline void NewGenericResolver(Re @@
 	res->GetVariable   = &GenericCallbackGetVariable;
 	res->ResolveReal   = &GenericCallbackResolveReal;
 	res->callback        = CBID_NO_CALLBACK;
 	res->callback_param1 = 0;
 	res->callback_param2 = 0;
 	res->last_value      = 0;
 	res->trigger         = 0;
 	res->reseed          = 0;
 	res->count           = 0;
 	res->ResetState();
 	res->grffile         = grffile;
+}
 /**
  * Follow a generic feature callback list and return the first successful

src/newgrf_house.cpp

➞

Show inline comments

@@ @@ -394,16 +394,13 @@ static void NewHouseResolver(ResolverObj @@
 	res->u.house.house_id = house_id;
 	res->u.house.not_yet_constructed = false;
 	res->callback        = CBID_NO_CALLBACK;
 	res->callback_param1 = 0;
 	res->callback_param2 = 0;
 	res->last_value      = 0;
 	res->trigger         = 0;
 	res->reseed          = 0;
 	res->count           = 0;
 	res->ResetState();
 	const HouseSpec *hs  = HouseSpec::Get(house_id);
 	res->grffile         = (hs != NULL ? hs->grf_prop.grffile : NULL);
+}
 uint16 GetHouseCallback(CallbackID callback, uint32 param1, uint32 param2, HouseID house_id, Town *town, TileIndex tile, bool not_yet_constructed, uint8 initial_random_bits)

src/newgrf_industries.cpp

➞

Show inline comments

@@ @@ -421,16 +421,13 @@ static void NewIndustryResolver(Resolver @@
 	res->u.industry.gfx  = INVALID_INDUSTRYTILE;
 	res->u.industry.type = type;
 	res->callback        = CBID_NO_CALLBACK;
 	res->callback_param1 = 0;
 	res->callback_param2 = 0;
 	res->last_value      = 0;
 	res->trigger         = 0;
 	res->reseed          = 0;
 	res->count           = 0;
 	res->ResetState();
 	const IndustrySpec *indspec = GetIndustrySpec(type);
 	res->grffile         = (indspec != NULL ? indspec->grf_prop.grffile : NULL);
+}
 /**

src/newgrf_industrytiles.cpp

➞

Show inline comments

@@ @@ -187,16 +187,13 @@ static void NewIndustryTileResolver(Reso @@
 	res->u.industry.gfx  = gfx;
 	res->u.industry.type = indus->type;
 	res->callback        = CBID_NO_CALLBACK;
 	res->callback_param1 = 0;
 	res->callback_param2 = 0;
 	res->last_value      = 0;
 	res->trigger         = 0;
 	res->reseed          = 0;
 	res->count           = 0;
 	res->ResetState();
 	const IndustryTileSpec *its = GetIndustryTileSpec(gfx);
 	res->grffile         = (its != NULL ? its->grf_prop.grffile : NULL);
+}
 static void IndustryDrawTileLayout(const TileInfo *ti, const TileLayoutSpriteGroup *group, byte rnd_colour, byte stage, IndustryGfx gfx)

src/newgrf_object.cpp

➞

Show inline comments

@@ @@ -390,16 +390,13 @@ static void NewObjectResolver(ResolverOb @@
 	res->u.object.tile = tile;
 	res->u.object.view = view;
 	res->callback        = CBID_NO_CALLBACK;
 	res->callback_param1 = 0;
 	res->callback_param2 = 0;
 	res->last_value      = 0;
 	res->trigger         = 0;
 	res->reseed          = 0;
 	res->count           = 0;
 	res->ResetState();
 	res->grffile = spec->grf_prop.grffile;
+}
 /**
  * Perform a callback for an object.

src/newgrf_railtype.cpp

➞

Show inline comments

@@ @@ -78,16 +78,13 @@ static inline void NewRailTypeResolver(R @@
 	res->u.routes.tile = tile;
 	res->u.routes.context = context;
 	res->callback        = CBID_NO_CALLBACK;
 	res->callback_param1 = 0;
 	res->callback_param2 = 0;
 	res->last_value      = 0;
 	res->trigger         = 0;
 	res->reseed          = 0;
 	res->count           = 0;
 	res->ResetState();
 	res->grffile         = grffile;
+}
 /**
  * Get the sprite to draw for the given tile.

src/newgrf_spritegroup.h

➞

Show inline comments

@@ @@ -378,9 +378,20 @@ struct ResolverObject { @@
 	uint32 (*GetRandomBits)(const struct ResolverObject*);
 	uint32 (*GetTriggers)(const struct ResolverObject*);
 	void (*SetTriggers)(const struct ResolverObject*, int);
 	uint32 (*GetVariable)(const struct ResolverObject*, byte, byte, bool*);
 	const SpriteGroup *(*ResolveReal)(const struct ResolverObject*, const RealSpriteGroup*);
 	void (*StorePSA)(struct ResolverObject*, uint, int32);
 	/**
 	 * Resets the dynamic state of the resolver object.
 	 * To be called before resolving an Action-1-2-3 chain.
 	 */
 	void ResetState()
+	{
 		this->last_value = 0;
 		this->trigger    = 0;
 		this->reseed     = 0;
+	}
 };
 #endif /* NEWGRF_SPRITEGROUP_H */

src/newgrf_station.cpp

➞

Show inline comments

@@ @@ -545,16 +545,14 @@ static void NewStationResolver(ResolverO @@
 	res->u.station.statspec = statspec;
 	res->u.station.tile     = tile;
 	res->callback        = CBID_NO_CALLBACK;
 	res->callback_param1 = 0;
 	res->callback_param2 = 0;
 	res->last_value      = 0;
 	res->trigger         = 0;
 	res->reseed          = 0;
 	res->count           = 0;
 	res->ResetState();
 	res->grffile         = (statspec != NULL ? statspec->grf_prop.grffile : NULL);
 	/* Invalidate all cached vars */
 	_svc.valid = 0;
+}

0 comments (0 inline, 0 general)