aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2010-12-15 23:35:21 +0000
committerFilippos Karapetis2010-12-15 23:35:21 +0000
commitaa152358586b30e6087dac4473ea6e8ff3417ca0 (patch)
tree4298cee3ec1db774491563793fde68c8fac478ae
parent58b72951934ecd9697c1c184a0f588a4aaa12fc1 (diff)
downloadscummvm-rg350-aa152358586b30e6087dac4473ea6e8ff3417ca0.tar.gz
scummvm-rg350-aa152358586b30e6087dac4473ea6e8ff3417ca0.tar.bz2
scummvm-rg350-aa152358586b30e6087dac4473ea6e8ff3417ca0.zip
SCI: Slight cleanup
svn-id: r54925
-rw-r--r--engines/sci/engine/seg_manager.cpp7
-rw-r--r--engines/sci/engine/seg_manager.h2
2 files changed, 3 insertions, 6 deletions
diff --git a/engines/sci/engine/seg_manager.cpp b/engines/sci/engine/seg_manager.cpp
index 7b2c6378ce..be03578755 100644
--- a/engines/sci/engine/seg_manager.cpp
+++ b/engines/sci/engine/seg_manager.cpp
@@ -146,11 +146,10 @@ Script *SegManager::allocateScript(int script_nr, SegmentId *segid) {
return (Script *)mem;
}
-int SegManager::deallocate(SegmentId seg, bool recursive) {
- SegmentObj *mobj;
+void SegManager::deallocate(SegmentId seg, bool recursive) {
VERIFY(check(seg), "invalid seg id");
- mobj = _heap[seg];
+ SegmentObj *mobj = _heap[seg];
if (mobj->getType() == SEG_TYPE_SCRIPT) {
Script *scr = (Script *)mobj;
@@ -161,8 +160,6 @@ int SegManager::deallocate(SegmentId seg, bool recursive) {
delete mobj;
_heap[seg] = NULL;
-
- return 1;
}
bool SegManager::isHeapObject(reg_t pos) const {
diff --git a/engines/sci/engine/seg_manager.h b/engines/sci/engine/seg_manager.h
index c3bf4ae2b6..61fa2e2245 100644
--- a/engines/sci/engine/seg_manager.h
+++ b/engines/sci/engine/seg_manager.h
@@ -477,7 +477,7 @@ private:
private:
SegmentObj *allocSegment(SegmentObj *mem, SegmentId *segid);
- int deallocate(SegmentId seg, bool recursive);
+ void deallocate(SegmentId seg, bool recursive);
void createClassTable();
SegmentId findFreeSegment() const;