Merged revisions 32879,32883,32895,32899,32902-32904,32910-32912,32923-32924,32930-32931,32938,32940,32948-32949,32951,32960-32964,32966-32970,32972-32974,32976,32978,32983,32986-32990,32992,32994,33002-33004,33006-33007,33009-33010,33014,33017,33021-33023,33030,33033,33052-33053,33056-33058,33061-33064,33068,33070,33072,33075,33078-33079,33083,33086-33087,33089,33094-33096,33098-33099,33104,33108-33109,33114-33117,33120,33135-33146,33160,33162,33165,33167-33169 via svnmerge from

https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33185

1 files changed, 58 insertions, 0 deletions

diff --git a/engines/gob/variables.cpp b/engines/gob/variables.cpp
index 0eea2f6547..805aaeb839 100644
--- a/engines/gob/variables.cpp
+++ b/engines/gob/variables.cpp
@@ -308,4 +308,62 @@ uint32 VariablesBE::read32(const byte *buf) const {
 	return READ_BE_UINT32(buf);
 }
 
+VariableReference::VariableReference() {
+	_vars = 0;
+	_offset = 0;
+}
+
+VariableReference::VariableReference(Variables &vars, uint32 offset, Variables::Type type) {
+	set(vars, offset, type);
+}
+
+VariableReference::~VariableReference() {
+}
+
+void VariableReference::set(Variables &vars, uint32 offset, Variables::Type type) {
+	_vars = &vars;
+	_offset = offset;
+	_type = type;
+}
+
+VariableReference &VariableReference::operator=(uint32 value) {
+	if (_vars) {
+		switch (_type) {
+			case Variables::kVariableType8:
+				_vars->writeOff8(_offset, (uint8) value);
+				break;
+			case Variables::kVariableType16:
+				_vars->writeOff16(_offset, (uint16) value);
+				break;
+			case Variables::kVariableType32:
+				_vars->writeOff32(_offset, value);
+				break;
+		}
+	}
+	return *this;
+}
+
+VariableReference::operator uint32() {
+	if (_vars) {
+		switch (_type) {
+			case Variables::kVariableType8:
+				return (uint32) _vars->readOff8(_offset);
+			case Variables::kVariableType16:
+				return (uint32) _vars->readOff16(_offset);
+			case Variables::kVariableType32:
+				return _vars->readOff32(_offset);
+		}
+	}
+
+	return 0;
+}
+
+VariableReference &VariableReference::operator+=(uint32 value) {
+	return (*this = (*this + value));
+}
+
+VariableReference &VariableReference::operator*=(uint32 value) {
+	return (*this = (*this * value));
+}
+
 } // End of namespace Gob