thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: Slight cleanup

Browse source 
svn-id: r54925
This commit is contained in:
Filippos Karapetis 2010-12-15 23:35:21 +00:00
parent 58b7295193
commit aa15235858
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
engines/sci/engine/seg_manager.cpp
View file

@ -146,11 +146,10 @@ Script *SegManager::allocateScript(int script_nr, SegmentId *segid) {
return (Script *)mem; return (Script *)mem;
} }
int SegManager::deallocate(SegmentId seg, bool recursive) { void SegManager::deallocate(SegmentId seg, bool recursive) {
SegmentObj *mobj;
VERIFY(check(seg), "invalid seg id"); VERIFY(check(seg), "invalid seg id");
mobj = _heap[seg]; SegmentObj *mobj = _heap[seg];
if (mobj->getType() == SEG_TYPE_SCRIPT) { if (mobj->getType() == SEG_TYPE_SCRIPT) {
Script *scr = (Script *)mobj; Script *scr = (Script *)mobj;
@ -161,8 +160,6 @@ int SegManager::deallocate(SegmentId seg, bool recursive) {
delete mobj; delete mobj;
_heap[seg] = NULL; _heap[seg] = NULL;
return 1;
} }
bool SegManager::isHeapObject(reg_t pos) const { bool SegManager::isHeapObject(reg_t pos) const {

2
engines/sci/engine/seg_manager.h
View file

@ -477,7 +477,7 @@ private:
private: private:
SegmentObj *allocSegment(SegmentObj *mem, SegmentId *segid); SegmentObj *allocSegment(SegmentObj *mem, SegmentId *segid);
int deallocate(SegmentId seg, bool recursive); void deallocate(SegmentId seg, bool recursive);
void createClassTable(); void createClassTable();
SegmentId findFreeSegment() const; SegmentId findFreeSegment() const;