cpp/openttd-patchpack/source Changeset - r25642:6743de9f1df8

Changeset - r25642:6743de9f1df8

Parent rev.

Child rev.

[Not reviewed]

master

0 9 0

Peter Nelson - 3 years ago 2021-06-04 11:52:00
peter1138@openttd.org

Codechange: Deduplicate ResolveReal() for resolvers that don't use real sprite groups.

This may change behaviour when multiple loading/loaded stages are provided, as the various copies checked in different orders, however only one result is expected in these cases anyway.

9 files changed with 3 insertions and 62 deletions:

src/newgrf_airport.cpp

src/newgrf_canal.cpp

src/newgrf_cargo.cpp

src/newgrf_generic.cpp

src/newgrf_railtype.cpp

src/newgrf_railtype.h

src/newgrf_roadtype.cpp

src/newgrf_roadtype.h

src/newgrf_spritegroup.cpp

0 comments (0 inline, 0 general)

src/newgrf_airport.cpp

➞

Show inline comments

@@ @@ -54,14 +54,12 @@ struct AirportResolverObject : public Re @@
 		switch (scope) {
 			case VSG_SCOPE_SELF: return &this->airport_scope;
 			default: return ResolverObject::GetScope(scope, relative);
+		}
+	}
 	const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const override;
 	GrfSpecFeature GetFeature() const override;
 	uint32 GetDebugID() const override;
 };
 /**
  * Reset airport classes to their default state.
@@ @@ -216,22 +214,12 @@ void AirportOverrideManager::SetEntitySp @@
 		case 0xFA: return Clamp(this->st->build_date - DAYS_TILL_ORIGINAL_BASE_YEAR, 0, 65535);
+	}
 	return this->st->GetNewGRFVariable(this->ro, variable, parameter, available);
+}
 /* virtual */ const SpriteGroup *AirportResolverObject::ResolveReal(const RealSpriteGroup *group) const
+{
 	/* Airport action 2s should always have only 1 "loaded" state, but some
 	 * times things don't follow the spec... */
 	if (!group->loaded.empty())  return group->loaded[0];
 	if (!group->loading.empty()) return group->loading[0];
 	return nullptr;
+}
 GrfSpecFeature AirportResolverObject::GetFeature() const
+{
 	return GSF_AIRPORTS;
+}
 uint32 AirportResolverObject::GetDebugID() const

src/newgrf_canal.cpp

➞

Show inline comments

@@ @@ -46,14 +46,12 @@ struct CanalResolverObject : public Reso @@
 		switch (scope) {
 			case VSG_SCOPE_SELF: return &this->canal_scope;
 			default: return ResolverObject::GetScope(scope, relative);
+		}
+	}
 	const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const override;
 	GrfSpecFeature GetFeature() const override;
 	uint32 GetDebugID() const override;
 };
 /* virtual */ uint32 CanalScopeResolver::GetRandomBits() const
+{
@@ @@ -105,20 +103,12 @@ struct CanalResolverObject : public Reso @@
 	DEBUG(grf, 1, "Unhandled canal variable 0x%02X", variable);
 	*available = false;
 	return UINT_MAX;
+}
 /* virtual */ const SpriteGroup *CanalResolverObject::ResolveReal(const RealSpriteGroup *group) const
+{
 	if (group->loaded.empty()) return nullptr;
 	return group->loaded[0];
+}
 GrfSpecFeature CanalResolverObject::GetFeature() const
+{
 	return GSF_CANALS;
+}
 uint32 CanalResolverObject::GetDebugID() const

src/newgrf_cargo.cpp

➞

Show inline comments

@@ @@ -16,28 +16,16 @@ @@
 /** Resolver of cargo. */
 struct CargoResolverObject : public ResolverObject {
 	const CargoSpec *cargospec;
 	CargoResolverObject(const CargoSpec *cs, CallbackID callback = CBID_NO_CALLBACK, uint32 callback_param1 = 0, uint32 callback_param2 = 0);
 	const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const override;
 	GrfSpecFeature GetFeature() const override;
 	uint32 GetDebugID() const override;
 };
 /* virtual */ const SpriteGroup *CargoResolverObject::ResolveReal(const RealSpriteGroup *group) const
+{
 	/* Cargo action 2s should always have only 1 "loaded" state, but some
 	 * times things don't follow the spec... */
 	if (!group->loaded.empty())  return group->loaded[0];
 	if (!group->loading.empty()) return group->loading[0];
 	return nullptr;
+}
 GrfSpecFeature CargoResolverObject::GetFeature() const
+{
 	return GSF_CARGOES;
+}
 uint32 CargoResolverObject::GetDebugID() const

src/newgrf_generic.cpp

➞

Show inline comments

@@ @@ -60,14 +60,12 @@ struct GenericResolverObject : public Re @@
 		switch (scope) {
 			case VSG_SCOPE_SELF: return &this->generic_scope;
 			default: return ResolverObject::GetScope(scope, relative);
+		}
+	}
 	const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const override;
 	GrfSpecFeature GetFeature() const override
+	{
 		return (GrfSpecFeature)this->generic_scope.feature;
+	}
 	uint32 GetDebugID() const override
@@ @@ -144,20 +142,12 @@ void AddGenericCallback(uint8 feature, c @@
 	DEBUG(grf, 1, "Unhandled generic feature variable 0x%02X", variable);
 	*available = false;
 	return UINT_MAX;
+}
 /* virtual */ const SpriteGroup *GenericResolverObject::ResolveReal(const RealSpriteGroup *group) const
+{
 	if (group->loaded.empty()) return nullptr;
 	return group->loaded[0];
+}
 /**
  * Generic resolver.
  * @param ai_callback Callback comes from the AI.
  * @param callback Callback ID.
  */
 GenericResolverObject::GenericResolverObject(bool ai_callback, CallbackID callback) : ResolverObject(nullptr, callback), generic_scope(*this, ai_callback)

src/newgrf_railtype.cpp

➞

Show inline comments

@@ @@ -55,19 +55,12 @@ @@
 	DEBUG(grf, 1, "Unhandled rail type tile variable 0x%X", variable);
 	*available = false;
 	return UINT_MAX;
+}
 /* virtual */ const SpriteGroup *RailTypeResolverObject::ResolveReal(const RealSpriteGroup *group) const
+{
 	if (!group->loading.empty()) return group->loading[0];
 	if (!group->loaded.empty())  return group->loaded[0];
 	return nullptr;
+}
 GrfSpecFeature RailTypeResolverObject::GetFeature() const
+{
 	return GSF_RAILTYPES;
+}
 uint32 RailTypeResolverObject::GetDebugID() const

src/newgrf_railtype.h

➞

Show inline comments

@@ @@ -46,14 +46,12 @@ struct RailTypeResolverObject : public R @@
 		switch (scope) {
 			case VSG_SCOPE_SELF: return &this->railtype_scope;
 			default:             return ResolverObject::GetScope(scope, relative);
+		}
+	}
 	const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const override;
 	GrfSpecFeature GetFeature() const override;
 	uint32 GetDebugID() const override;
 };
 SpriteID GetCustomRailSprite(const RailtypeInfo *rti, TileIndex tile, RailTypeSpriteGroup rtsg, TileContext context = TCX_NORMAL, uint *num_results = nullptr);
 SpriteID GetCustomSignalSprite(const RailtypeInfo *rti, TileIndex tile, SignalType type, SignalVariant var, SignalState state, bool gui = false);

src/newgrf_roadtype.cpp

➞

Show inline comments

@@ @@ -55,19 +55,12 @@ @@
 	DEBUG(grf, 1, "Unhandled road type tile variable 0x%X", variable);
 	*available = false;
 	return UINT_MAX;
+}
 /* virtual */ const SpriteGroup *RoadTypeResolverObject::ResolveReal(const RealSpriteGroup *group) const
+{
 	if (!group->loading.empty()) return group->loading[0];
 	if (!group->loaded.empty())  return group->loaded[0];
 	return nullptr;
+}
 GrfSpecFeature RoadTypeResolverObject::GetFeature() const
+{
 	RoadType rt = GetRoadTypeByLabel(this->roadtype_scope.rti->label, false);
 	switch (GetRoadTramType(rt)) {
 		case RTT_ROAD: return GSF_ROADTYPES;
 		case RTT_TRAM: return GSF_TRAMTYPES;

src/newgrf_roadtype.h

➞

Show inline comments

@@ @@ -37,14 +37,12 @@ struct RoadTypeResolverObject : public R @@
 		switch (scope) {
 			case VSG_SCOPE_SELF: return &this->roadtype_scope;
 			default:             return ResolverObject::GetScope(scope, relative);
+		}
+	}
 	const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const override;
 	GrfSpecFeature GetFeature() const override;
 	uint32 GetDebugID() const override;
 };
 SpriteID GetCustomRoadSprite(const RoadTypeInfo *rti, TileIndex tile, RoadTypeSpriteGroup rtsg, TileContext context = TCX_NORMAL, uint *num_results = nullptr);

src/newgrf_spritegroup.cpp

➞

Show inline comments

@@ @@ -121,12 +121,15 @@ static inline uint32 GetVariable(const R @@
  * Get the real sprites of the grf.
  * @param group Group to get.
  * @return The available sprite group.
  */
 /* virtual */ const SpriteGroup *ResolverObject::ResolveReal(const RealSpriteGroup *group) const
+{
 	if (!group->loaded.empty())  return group->loaded[0];
 	if (!group->loading.empty()) return group->loading[0];
 	return nullptr;
+}
 /**
  * Get a resolver for the \a scope.
  * @param scope Scope to return.

0 comments (0 inline, 0 general)