aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/segment.h
diff options
context:
space:
mode:
authorMax Horn2010-05-29 23:09:00 +0000
committerMax Horn2010-05-29 23:09:00 +0000
commit4ecacdad164d95154ac8a645058c2de0e2be73a9 (patch)
treef87728c335baad1cdbd1608a3d291993441babe2 /engines/sci/engine/segment.h
parent42d6ed880b92e19c469c70da92397bd860abb483 (diff)
downloadscummvm-rg350-4ecacdad164d95154ac8a645058c2de0e2be73a9.tar.gz
scummvm-rg350-4ecacdad164d95154ac8a645058c2de0e2be73a9.tar.bz2
scummvm-rg350-4ecacdad164d95154ac8a645058c2de0e2be73a9.zip
SCI: Merge Script::relocateBlock and Object::relocate
The shared code now resides in a new static function named relocateBlock, which is invoked by the two methods. svn-id: r49316
Diffstat (limited to 'engines/sci/engine/segment.h')
-rw-r--r--engines/sci/engine/segment.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/engines/sci/engine/segment.h b/engines/sci/engine/segment.h
index baff120b1c..0b4e6bb665 100644
--- a/engines/sci/engine/segment.h
+++ b/engines/sci/engine/segment.h
@@ -408,8 +408,7 @@ public:
void heapRelocate(reg_t block);
private:
- int relocateLocal(SegmentId segment, int location);
- int relocateBlock(Common::Array<reg_t> &block, int block_location, SegmentId segment, int location);
+ bool relocateLocal(SegmentId segment, int location);
public:
// script lock operations