[Scummvm-cvs-logs] SF.net SVN: scummvm:[54925] scummvm/trunk/engines/sci/engine

[thebluegr at users.sourceforge.net]

Revision: 54925
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54925&view=rev
Author:   thebluegr
Date:     2010-12-15 23:35:21 +0000 (Wed, 15 Dec 2010)

Log Message:
-----------
SCI: Slight cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/seg_manager.cpp
    scummvm/trunk/engines/sci/engine/seg_manager.h

Modified: scummvm/trunk/engines/sci/engine/seg_manager.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/seg_manager.cpp	2010-12-15 22:36:55 UTC (rev 54924)
+++ scummvm/trunk/engines/sci/engine/seg_manager.cpp	2010-12-15 23:35:21 UTC (rev 54925)
@@ -146,11 +146,10 @@
 	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 @@
 
 	delete mobj;
 	_heap[seg] = NULL;
-
-	return 1;
 }
 
 bool SegManager::isHeapObject(reg_t pos) const {

Modified: scummvm/trunk/engines/sci/engine/seg_manager.h
===================================================================
--- scummvm/trunk/engines/sci/engine/seg_manager.h	2010-12-15 22:36:55 UTC (rev 54924)
+++ scummvm/trunk/engines/sci/engine/seg_manager.h	2010-12-15 23:35:21 UTC (rev 54925)
@@ -477,7 +477,7 @@
 
 private:
 	SegmentObj *allocSegment(SegmentObj *mem, SegmentId *segid);
-	int deallocate(SegmentId seg, bool recursive);
+	void deallocate(SegmentId seg, bool recursive);
 	void createClassTable();
 
 	SegmentId findFreeSegment() const;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.