cpp/openttd-patchpack/source File Diff

File diff r25641:67d7642297d6 → r25642:6743de9f1df8

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)