(svn r17672) -Revert (r8081): 'last_value' and 'reseed' are shared between procedure and main chain.

-Fix (r8075): 'scope' and 'count' are not.

1 files changed, 8 insertions, 6 deletions

diff --git a/src/newgrf_spritegroup.h b/src/newgrf_spritegroup.h
index 0382de7c6..f10574bdd 100644
--- a/src/newgrf_spritegroup.h
+++ b/src/newgrf_spritegroup.h
@@ -291,14 +291,16 @@ struct ResolverObject {
 	uint32 callback_param2;
 
 	byte trigger;
-	byte count;
-	uint32 last_value;
-	uint32 reseed;
-	VarSpriteGroupScope scope;
 
-	BaseStorageArray *psa; ///< The persistent storage array of this resolved object.
+	uint32 last_value;          ///< Result of most recent DeterministicSpriteGroup (including procedure calls)
+	uint32 reseed;              ///< Collects bits to rerandomise while triggering triggers.
+
+	VarSpriteGroupScope scope;  ///< Scope of currently resolved DeterministicSpriteGroup resp. RandomizedSpriteGroup
+	byte count;                 ///< Additional scope for RandomizedSpriteGroup
+
+	BaseStorageArray *psa;      ///< The persistent storage array of this resolved object.
 
-	const GRFFile *grffile; ///< GRFFile the resolved SpriteGroup belongs to
+	const GRFFile *grffile;     ///< GRFFile the resolved SpriteGroup belongs to
 
 	union {
 		struct {