[Scummvm-cvs-logs] scummvm master -> f501e91ed1490fde5227015dc02fbe6c0cee2b5f

dreammaster dreammaster at scummvm.org
Thu Mar 5 15:13:59 CET 2015


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:
f501e91ed1 MADS: Fix crash after throwing both bones to dog


Commit: f501e91ed1490fde5227015dc02fbe6c0cee2b5f
    https://github.com/scummvm/scummvm/commit/f501e91ed1490fde5227015dc02fbe6c0cee2b5f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-03-05T09:12:20-05:00

Commit Message:
MADS: Fix crash after throwing both bones to dog

Changed paths:
    engines/mads/sprites.cpp



diff --git a/engines/mads/sprites.cpp b/engines/mads/sprites.cpp
index f74edaf..aa73fce 100644
--- a/engines/mads/sprites.cpp
+++ b/engines/mads/sprites.cpp
@@ -406,7 +406,7 @@ void SpriteSets::remove(int idx) {
 			} while (size() > 0 && (*this)[size() - 1] == nullptr);
 		}
 
-		if (_assetCount > 0)
+		if (idx < 50 && _assetCount > 0)
 			--_assetCount;
 	}
 }






More information about the Scummvm-git-logs mailing list