cpp/openttd-patchpack/source File Diff

File diff r23496:661d21df67d7 → r23497:a0ab44ebd2fa

src/newgrf_canal.cpp

➞

Show inline comments

@@ @@ -30,8 +30,8 @@ struct CanalScopeResolver : public Scope @@
+	{
+	}
 	/* virtual */ uint32 GetRandomBits() const;
 	/* virtual */ uint32 GetVariable(byte variable, uint32 parameter, bool *available) const;
 	uint32 GetRandomBits() const override;
 	uint32 GetVariable(byte variable, uint32 parameter, bool *available) const override;
 };
 /** Resolver object for canals. */
@@ @@ -41,7 +41,7 @@ struct CanalResolverObject : public Reso @@
 	CanalResolverObject(CanalFeature feature, TileIndex tile,
 			CallbackID callback = CBID_NO_CALLBACK, uint32 callback_param1 = 0, uint32 callback_param2 = 0);
-	/* virtual */ ScopeResolver *GetScope(VarSpriteGroupScope scope = VSG_SCOPE_SELF, byte relative = 0)
+	ScopeResolver *GetScope(VarSpriteGroupScope scope = VSG_SCOPE_SELF, byte relative = 0) override
+	{
 		switch (scope) {
 			case VSG_SCOPE_SELF: return &this->canal_scope;
@@ @@ -49,7 +49,7 @@ struct CanalResolverObject : public Reso @@
+		}
+	}
-	/* virtual */ const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const;
+	const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const override;
 };
 /* virtual */ uint32 CanalScopeResolver::GetRandomBits() const