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

[Strangerke]

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:
c40df9a6ed TSAGE: Work around a data issue in R2R.


Commit: c40df9a6edc320ad2f3c8187e4b0c2d1eb9c6aa8
    https://github.com/scummvm/scummvm/commit/c40df9a6edc320ad2f3c8187e4b0c2d1eb9c6aa8
Author: Strangerke (strangerke at scummvm.org)
Date: 2011-12-21T15:33:18-08:00

Commit Message:
TSAGE: Work around a data issue in R2R.

The character name doesn't seem case sensitive in R2R

Changed paths:
    engines/tsage/converse.cpp



diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp
index 00c0b3a..1542b0a 100644
--- a/engines/tsage/converse.cpp
+++ b/engines/tsage/converse.cpp
@@ -888,6 +888,17 @@ Speaker *StripManager::getSpeaker(const char *speakerName) {
 			return _speakerList[idx];
 	}
 
+	// TODO: Check if it necessary to make a strcmp first.
+	//
+	// If nothing is found, recheck and ignore the case as
+	// in R2R, some character names aren't in uppercase.
+	if (g_vm->getGameID() == GType_Ringworld2) {
+		for (uint idx = 0; idx < _speakerList.size(); ++idx) {
+			if (!scumm_stricmp(_speakerList[idx]->_speakerName.c_str(), speakerName))
+				return _speakerList[idx];
+		}
+	}
+
 	return NULL;
 }