[Scummvm-cvs-logs] scummvm master -> 24e50eb218db5de3bad806737cba247798112a2a

[sylvaintv]

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

Summary:
8b39b0b0fa TOON: Add russian version detection
24e50eb218 TOON: Fix bug #3467139 with russian version crash


Commit: 8b39b0b0faa07ec5bc5f18cc2ec00ecd5b3fb949
    https://github.com/scummvm/scummvm/commit/8b39b0b0faa07ec5bc5f18cc2ec00ecd5b3fb949
Author: sylvaintv (sylvaintv at gmail.com)
Date: 2012-02-12T14:16:54-08:00

Commit Message:
TOON: Add russian version detection

Changed paths:
    engines/toon/detection.cpp



diff --git a/engines/toon/detection.cpp b/engines/toon/detection.cpp
index 6a76ade..8234934 100644
--- a/engines/toon/detection.cpp
+++ b/engines/toon/detection.cpp
@@ -79,6 +79,15 @@ static const ADGameDescription gameDescriptions[] = {
 	{
 		"toon", "",
 		{
+			{"local.pak", 0, "48ec60709bebbdeff791d55ee18ec910", 3417846},
+			{"arcaddbl.svl", 0, "1d1b96e317e03ffd3874a8ebe59556f3", 6246232},
+			{"study.svl", 0, "d4aff126ee27be3c3d25e2996369d7cb", 2324368},
+		},
+		Common::RU_RUS, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO0()
+	},		
+	{
+		"toon", "",
+		{
 			{"local.pak", 0, "bf5da4c03f78ffbd643f12122319366e", 3250841},
 			{"wacexdbl.emc", 0, "cfbc2156a31b294b038204888407ebc8", 6974},
 			{"generic.svl", 0, "5eb99850ada22f0b8cf6392262d4dd07", 9404599},


Commit: 24e50eb218db5de3bad806737cba247798112a2a
    https://github.com/scummvm/scummvm/commit/24e50eb218db5de3bad806737cba247798112a2a
Author: sylvaintv (sylvaintv at gmail.com)
Date: 2012-02-12T14:18:40-08:00

Commit Message:
TOON: Fix bug #3467139 with russian version crash

Bug #3467139: "TOON: Russian Version Crashes"
A frame is corrupted in an localized animation
Moved the check before the Rect creation.

Changed paths:
    engines/toon/toon.cpp



diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index 9993236..657e186 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -4666,11 +4666,11 @@ void ToonEngine::addDirtyRect( int32 left, int32 top, int32 right, int32 bottom
 	top = MIN<int32>(MAX<int32>(top, 0), TOON_BACKBUFFER_HEIGHT);
 	bottom = MIN<int32>(MAX<int32>(bottom, 0), TOON_BACKBUFFER_HEIGHT);
 
-	Common::Rect rect(left, top, right, bottom);
-
 	if (bottom - top <= 0 || right - left <= 0)
 		return;
 
+	Common::Rect rect(left, top, right, bottom);
+
 	for (uint32 i = 0; i < _dirtyRects.size(); i++) {
 		if (_dirtyRects[i].contains(rect))
 			return;