aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/gc.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2012-06-18 05:21:59 +0300
committerFilippos Karapetis2012-06-18 05:24:06 +0300
commit2b50824133ced47f1d8fb6407a1e0212a7eeb41c (patch)
tree9694687f829e097a92af756e38d05b3078829636 /engines/sci/engine/gc.cpp
parent3c04d333f2f6a423a67a8d0202ffca29d22da9db (diff)
downloadscummvm-rg350-2b50824133ced47f1d8fb6407a1e0212a7eeb41c.tar.gz
scummvm-rg350-2b50824133ced47f1d8fb6407a1e0212a7eeb41c.tar.bz2
scummvm-rg350-2b50824133ced47f1d8fb6407a1e0212a7eeb41c.zip
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)
Diffstat (limited to 'engines/sci/engine/gc.cpp')
-rw-r--r--engines/sci/engine/gc.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sci/engine/gc.cpp b/engines/sci/engine/gc.cpp
index 2d71878bda..9a30ff3e17 100644
--- a/engines/sci/engine/gc.cpp
+++ b/engines/sci/engine/gc.cpp
@@ -47,7 +47,7 @@ const char *segmentTypeNames[] = {
#endif
void WorklistManager::push(reg_t reg) {
- if (!reg.segment) // No numbers
+ if (!reg.getSegment()) // No numbers
return;
debugC(kDebugLevelGC, "[GC] Adding %04x:%04x", PRINT_REG(reg));
@@ -69,7 +69,7 @@ static AddrSet *normalizeAddresses(SegManager *segMan, const AddrSet &nonnormal_
for (AddrSet::const_iterator i = nonnormal_map.begin(); i != nonnormal_map.end(); ++i) {
reg_t reg = i->_key;
- SegmentObj *mobj = segMan->getSegmentObj(reg.segment);
+ SegmentObj *mobj = segMan->getSegmentObj(reg.getSegment());
if (mobj) {
reg = mobj->findCanonicAddress(segMan, reg);
@@ -85,11 +85,11 @@ static void processWorkList(SegManager *segMan, WorklistManager &wm, const Commo
while (!wm._worklist.empty()) {
reg_t reg = wm._worklist.back();
wm._worklist.pop_back();
- if (reg.segment != stackSegment) { // No need to repeat this one
+ if (reg.getSegment() != stackSegment) { // No need to repeat this one
debugC(kDebugLevelGC, "[GC] Checking %04x:%04x", PRINT_REG(reg));
- if (reg.segment < heap.size() && heap[reg.segment]) {
+ if (reg.getSegment() < heap.size() && heap[reg.getSegment()]) {
// Valid heap object? Find its outgoing references!
- wm.pushArray(heap[reg.segment]->listAllOutgoingReferences(reg));
+ wm.pushArray(heap[reg.getSegment()]->listAllOutgoingReferences(reg));
}
}
}