1 files changed, 34 insertions, 13 deletions

diff --git a/engines/sci/engine/vm_types.h b/engines/sci/engine/vm_types.h
index 7b155a4532..2995ba3c12 100644
--- a/engines/sci/engine/vm_types.h
+++ b/engines/sci/engine/vm_types.h
@@ -31,43 +31,64 @@ namespace Sci {
 typedef uint16 SegmentId;
 
 struct reg_t {
-	SegmentId segment;
-	uint16 offset;
+	// Segment and offset. These should never be accessed directly
+	SegmentId _segment;
+	uint16 _offset;
+
+	inline SegmentId getSegment() const {
+		return _segment;
+	}
+
+	inline void setSegment(SegmentId segment) {
+		_segment = segment;
+	}
+
+	inline uint16 getOffset() const {
+		return _offset;
+	}
+
+	inline void setOffset(uint16 offset) {
+		_offset = offset;
+	}
+
+	inline void incOffset(int16 offset) {
+		setOffset(getOffset() + offset);
+	}
 
 	inline bool isNull() const {
-		return (offset | segment) == 0;
+		return (_offset | getSegment()) == 0;
 	}
 
 	inline uint16 toUint16() const {
-		return offset;
+		return _offset;
 	}
 
 	inline int16 toSint16() const {
-		return (int16)offset;
+		return (int16)_offset;
 	}
 
 	bool isNumber() const {
-		return segment == 0;
+		return getSegment() == 0;
 	}
 
 	bool isPointer() const {
-		return segment != 0 && segment != 0xFFFF;
+		return getSegment() != 0 && getSegment() != 0xFFFF;
 	}
 
 	uint16 requireUint16() const;
 	int16 requireSint16() const;
 
 	inline bool isInitialized() const {
-		return segment != 0xFFFF;
+		return getSegment() != 0xFFFF;
 	}
 
 	// Comparison operators
 	bool operator==(const reg_t &x) const {
-		return (offset == x.offset) && (segment == x.segment);
+		return (getOffset() == x.getOffset()) && (getSegment() == x.getSegment());
 	}
 
 	bool operator!=(const reg_t &x) const {
-		return (offset != x.offset) || (segment != x.segment);
+		return (getOffset() != x.getOffset()) || (getSegment() != x.getSegment());
 	}
 
 	bool operator>(const reg_t right) const {
@@ -141,12 +162,12 @@ private:
 
 static inline reg_t make_reg(SegmentId segment, uint16 offset) {
 	reg_t r;
-	r.offset = offset;
-	r.segment = segment;
+	r.setSegment(segment);
+	r.setOffset(offset);
 	return r;
 }
 
-#define PRINT_REG(r) (0xffff) & (unsigned) (r).segment, (unsigned) (r).offset
+#define PRINT_REG(r) (0xffff) & (unsigned) (r).getSegment(), (unsigned) (r).getOffset()
 
 // Stack pointer type
 typedef reg_t *StackPtr;