From 2b50824133ced47f1d8fb6407a1e0212a7eeb41c Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 18 Jun 2012 05:21:59 +0300
Subject: SCI: Add setter/getter methods to reg_t's

No functionality change has been made with this commit. This avoids
setting and getting the reg_t members directly, and is the basis of any
future work on large SCI3 scripts (larger than 64KB)
---
 engines/sci/engine/segment.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'engines/sci/engine/segment.h')

diff --git a/engines/sci/engine/segment.h b/engines/sci/engine/segment.h
index 54cf7b98af..0d54b651e1 100644
--- a/engines/sci/engine/segment.h
+++ b/engines/sci/engine/segment.h
@@ -175,7 +175,7 @@ public:
 	}
 	virtual SegmentRef dereference(reg_t pointer);
 	virtual reg_t findCanonicAddress(SegManager *segMan, reg_t addr) const {
-		return make_reg(addr.segment, 0);
+		return make_reg(addr.getSegment(), 0);
 	}
 	virtual Common::Array<reg_t> listAllOutgoingReferences(reg_t object) const;
 
@@ -291,7 +291,7 @@ struct NodeTable : public SegmentObjTable<Node> {
 	NodeTable() : SegmentObjTable<Node>(SEG_TYPE_NODES) {}
 
 	virtual void freeAtAddress(SegManager *segMan, reg_t sub_addr) {
-		freeEntry(sub_addr.offset);
+		freeEntry(sub_addr.getOffset());
 	}
 	virtual Common::Array<reg_t> listAllOutgoingReferences(reg_t object) const;
 
@@ -304,7 +304,7 @@ struct ListTable : public SegmentObjTable<List> {
 	ListTable() : SegmentObjTable<List>(SEG_TYPE_LISTS) {}
 
 	virtual void freeAtAddress(SegManager *segMan, reg_t sub_addr) {
-		freeEntry(sub_addr.offset);
+		freeEntry(sub_addr.getOffset());
 	}
 	virtual Common::Array<reg_t> listAllOutgoingReferences(reg_t object) const;
 
@@ -333,7 +333,7 @@ struct HunkTable : public SegmentObjTable<Hunk> {
 	}
 
 	virtual void freeAtAddress(SegManager *segMan, reg_t sub_addr) {
-		freeEntry(sub_addr.offset);
+		freeEntry(sub_addr.getOffset());
 	}
 
 	virtual void saveLoadWithSerializer(Common::Serializer &ser);
@@ -358,7 +358,7 @@ public:
 	}
 	virtual SegmentRef dereference(reg_t pointer);
 	virtual reg_t findCanonicAddress(SegManager *segMan, reg_t addr) const {
-		return make_reg(addr.segment, 0);
+		return make_reg(addr.getSegment(), 0);
 	}
 	virtual Common::Array<reg_t> listAllDeallocatable(SegmentId segId) const {
 		const reg_t r = make_reg(segId, 0);
@@ -502,8 +502,8 @@ struct StringTable : public SegmentObjTable<SciString> {
 	StringTable() : SegmentObjTable<SciString>(SEG_TYPE_STRING) {}
 
 	virtual void freeAtAddress(SegManager *segMan, reg_t sub_addr) {
-		_table[sub_addr.offset].destroy();
-		freeEntry(sub_addr.offset);
+		_table[sub_addr.getOffset()].destroy();
+		freeEntry(sub_addr.getOffset());
 	}
 
 	void saveLoadWithSerializer(Common::Serializer &ser);
-- 
cgit v1.2.3