[Scummvm-git-logs] scummvm master -> 82c39aa6adc2ee346ffc7b0880661492436bb5b4

[csnover]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
82c39aa6ad SCI32: Fix garbage collection of objects stored in IntArrays


Commit: 82c39aa6adc2ee346ffc7b0880661492436bb5b4
    https://github.com/scummvm/scummvm/commit/82c39aa6adc2ee346ffc7b0880661492436bb5b4
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-10-11T19:40:08-05:00

Commit Message:
SCI32: Fix garbage collection of objects stored in IntArrays

Changed paths:
    engines/sci/engine/segment.cpp



diff --git a/engines/sci/engine/segment.cpp b/engines/sci/engine/segment.cpp
index 32f1614..fffa7f4 100644
--- a/engines/sci/engine/segment.cpp
+++ b/engines/sci/engine/segment.cpp
@@ -274,7 +274,7 @@ Common::Array<reg_t> ArrayTable::listAllOutgoingReferences(reg_t addr) const {
 	}
 
 	SciArray &array = const_cast<SciArray &>(at(addr.getOffset()));
-	if (array.getType() == kArrayTypeID) {
+	if (array.getType() == kArrayTypeID || array.getType() == kArrayTypeInt16) {
 		for (uint16 i = 0; i < array.size(); ++i) {
 			const reg_t value = array.getAsID(i);
 			if (value.isPointer()) {