[Scummvm-cvs-logs] SF.net SVN: scummvm: [25283] scummvm/trunk/engines/touche

cyx at users.sourceforge.net cyx at users.sourceforge.net
Tue Jan 30 21:18:07 CET 2007


Revision: 25283
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25283&view=rev
Author:   cyx
Date:     2007-01-30 12:18:06 -0800 (Tue, 30 Jan 2007)

Log Message:
-----------
added checks to prevent crash if no datafiles can be found, also fixed a typo

Modified Paths:
--------------
    scummvm/trunk/engines/touche/plugin.cpp
    scummvm/trunk/engines/touche/touche.cpp

Modified: scummvm/trunk/engines/touche/plugin.cpp
===================================================================
--- scummvm/trunk/engines/touche/plugin.cpp	2007-01-30 12:42:09 UTC (rev 25282)
+++ scummvm/trunk/engines/touche/plugin.cpp	2007-01-30 20:18:06 UTC (rev 25283)
@@ -36,7 +36,7 @@
 static const PlainGameDescriptor toucheGames[] = {
 	{"touche", "Touche: The Adventures of the Fifth Musketeer"},
 	{"touche-fr", "Touche: Les Aventures du Cinquieme Mousquetaire"},
-	{"touche-de", "Touche - Die Abenteuer des funften Musketiers"},
+	{"touche-de", "Touche: Die Abenteuer des funften Musketiers"},
 	{"touche-it", "Touche: The Adventures of the Fifth Musketeer"},
 	{0, 0}
 };
@@ -116,6 +116,8 @@
 
 bool ToucheEngine::detectGame() {
 	int i = Common::AdvancedDetector::detectBestMatchingGame(detectionParams);
+	if (i < 0)
+		return false;
 
 	_language = gameDescriptions[i].language;
 	return true;

Modified: scummvm/trunk/engines/touche/touche.cpp
===================================================================
--- scummvm/trunk/engines/touche/touche.cpp	2007-01-30 12:42:09 UTC (rev 25282)
+++ scummvm/trunk/engines/touche/touche.cpp	2007-01-30 20:18:06 UTC (rev 25283)
@@ -33,7 +33,7 @@
 namespace Touche {
 
 ToucheEngine::ToucheEngine(OSystem *system)
-	: Engine(system) {
+	: Engine(system), _midiPlayer(0) {
 
 	_saveLoadCurrentPage = 0;
 	_saveLoadCurrentSlot = 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list