Changed tricky variable access from pointers to a new class that minds endianess.

This should fix a few regressions with BE games on LE systems and vice versa that I introduced when I changed how variables are stored (which was necessary to get Woodruff work on BE systems).

svn-id: r33014

1 files changed, 26 insertions, 0 deletions

diff --git a/engines/gob/variables.h b/engines/gob/variables.h
index 5989ed38ee..32f160a6bd 100644
--- a/engines/gob/variables.h
+++ b/engines/gob/variables.h
@@ -30,6 +30,12 @@ namespace Gob {
 
 class Variables {
 public:
+	enum Type {
+		kVariableType8,
+		kVariableType16,
+		kVariableType32
+	};
+
 	Variables(uint32 size);
 	virtual ~Variables();
 
@@ -142,6 +148,26 @@ protected:
 	uint32 read32(const byte *buf) const;
 };
 
+class VariableReference {
+	public:
+		VariableReference();
+		VariableReference(Variables &vars, uint32 offset,
+				Variables::Type type = Variables::kVariableType32);
+		~VariableReference();
+
+		void set(Variables &vars, uint32 offset, Variables::Type type = Variables::kVariableType32);
+
+		VariableReference &operator=(uint32 value);
+		VariableReference &operator+=(uint32 value);
+		VariableReference &operator*=(uint32 value);
+		operator uint32();
+
+	private:
+		Variables *_vars;
+		uint32 _offset;
+		Variables::Type _type;
+};
+
 } // End of namespace Gob
 
 #endif // GOB_VARIABLES_H