SCI: Merge SegManager::alloc_Hunk into SegManager::allocateHunkEntry

svn-id: r45041

2 files changed, 14 insertions, 20 deletions

diff --git a/engines/sci/engine/seg_manager.cpp b/engines/sci/engine/seg_manager.cpp
index c318be21c9..dd635d2146 100644
--- a/engines/sci/engine/seg_manager.cpp
+++ b/engines/sci/engine/seg_manager.cpp
@@ -735,8 +735,18 @@ void SegManager::freeHunkEntry(reg_t addr) {
 	ht->freeEntry(addr.offset);
 }
 
-Hunk *SegManager::allocateHunkEntry(const char *hunk_type, int size, reg_t *reg) {
-	Hunk *h = alloc_Hunk(reg);
+Hunk *SegManager::allocateHunkEntry(const char *hunk_type, int size, reg_t *addr) {
+	HunkTable *table;
+	int offset;
+
+	if (!Hunks_seg_id)
+		allocSegment(new HunkTable(), &(Hunks_seg_id));
+	table = (HunkTable *)_heap[Hunks_seg_id];
+
+	offset = table->allocEntry();
+
+	*addr = make_reg(Hunks_seg_id, offset);
+	Hunk *h = &(table->_table[offset]);
 
 	if (!h)
 		return NULL;
@@ -752,9 +762,9 @@ Clone *SegManager::allocateClone(reg_t *addr) {
 	CloneTable *table;
 	int offset;
 
-	if (!Clones_seg_id) {
+	if (!Clones_seg_id)
 		table = (CloneTable *)allocSegment(new CloneTable(), &(Clones_seg_id));
-	} else
+	else
 		table = (CloneTable *)_heap[Clones_seg_id];
 
 	offset = table->allocEntry();
@@ -824,20 +834,6 @@ Node *SegManager::allocateNode(reg_t *addr) {
 	return &(table->_table[offset]);
 }
 
-Hunk *SegManager::alloc_Hunk(reg_t *addr) {
-	HunkTable *table;
-	int offset;
-
-	if (!Hunks_seg_id)
-		allocSegment(new HunkTable(), &(Hunks_seg_id));
-	table = (HunkTable *)_heap[Hunks_seg_id];
-
-	offset = table->allocEntry();
-
-	*addr = make_reg(Hunks_seg_id, offset);
-	return &(table->_table[offset]);
-}
-
 List *SegManager::lookupList(reg_t addr) {
 	if (getSegmentType(addr.segment) != SEG_TYPE_LISTS) {
 		warning("Attempt to use non-list %04x:%04x as list", PRINT_REG(addr));
diff --git a/engines/sci/engine/seg_manager.h b/engines/sci/engine/seg_manager.h
index 078e626af4..1a9d20dea3 100644
--- a/engines/sci/engine/seg_manager.h
+++ b/engines/sci/engine/seg_manager.h
@@ -458,8 +458,6 @@ private:
 	int deallocate(SegmentId seg, bool recursive);
 	int createClassTable();
 
-	Hunk *alloc_Hunk(reg_t *);
-
 	SegmentId findFreeSegment() const;
 
 	/**