(svn r24692) -Cleanup: Cleanup final parts of the old resolver code.

1 files changed, 0 insertions, 20 deletions

diff --git a/src/newgrf_spritegroup.h b/src/newgrf_spritegroup.h
index 6516a8eb3..ac2f939b2 100644
--- a/src/newgrf_spritegroup.h
+++ b/src/newgrf_spritegroup.h
@@ -317,24 +317,11 @@ struct ScopeResolver {
 	virtual void StorePSA(uint reg, int32 value);
 };
 
-struct TempScopeResolver : public ScopeResolver {
-	TempScopeResolver(ResolverObject *ro);
-
-	virtual uint32 GetRandomBits() const;
-	virtual uint32 GetTriggers() const;
-	virtual void SetTriggers(int triggers) const;
-
-	virtual uint32 GetVariable(byte variable, uint32 parameter, bool *available) const;
-	virtual void StorePSA(uint reg, int32 value);
-};
-
 struct ResolverObject {
-	ResolverObject();
 	ResolverObject(const GRFFile *grffile, CallbackID callback = CBID_NO_CALLBACK, uint32 callback_param1 = 0, uint32 callback_param2 = 0);
 	virtual ~ResolverObject();
 
 	ScopeResolver default_scope; ///< Default implementation of the grf scope.
-	TempScopeResolver temp_scope; ///< Temporary scope resolver to refer back to the methods of #ResolverObject.
 
 	CallbackID callback;
 	uint32 callback_param1;
@@ -350,13 +337,6 @@ struct ResolverObject {
 
 	const GRFFile *grffile;     ///< GRFFile the resolved SpriteGroup belongs to
 
-	uint32 (*GetRandomBits)(const struct ResolverObject*);
-	uint32 (*GetTriggers)(const struct ResolverObject*);
-	void (*SetTriggers)(const struct ResolverObject*, int);
-	uint32 (*GetVariable)(const struct ResolverObject *object, byte variable, uint32 parameter, bool *available);
-	const SpriteGroup *(*ResolveRealMethod)(const struct ResolverObject*, const RealSpriteGroup*);
-	void (*StorePSA)(struct ResolverObject*, uint, int32);
-
 	virtual const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const;
 
 	virtual ScopeResolver *GetScope(VarSpriteGroupScope scope = VSG_SCOPE_SELF, byte relative = 0);