[Scummvm-cvs-logs] SF.net SVN: scummvm: [26009] scummvm/trunk/engines/gob/cdrom.cpp

[drmccoy at users.sourceforge.net]

Revision: 26009
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26009&view=rev
Author:   drmccoy
Date:     2007-03-07 11:57:24 -0800 (Wed, 07 Mar 2007)

Log Message:
-----------
Fixed the crash in the interlude before the last level in the Gobliiins CD-version

Modified Paths:
--------------
    scummvm/trunk/engines/gob/cdrom.cpp

Modified: scummvm/trunk/engines/gob/cdrom.cpp
===================================================================
--- scummvm/trunk/engines/gob/cdrom.cpp	2007-03-07 00:46:31 UTC (rev 26008)
+++ scummvm/trunk/engines/gob/cdrom.cpp	2007-03-07 19:57:24 UTC (rev 26009)
@@ -145,9 +145,11 @@
 		{"avt022.tot", "fra6", "all6", "ang6", "esp6", "ita6"}
 	};
 
+	// Default to "ang?" for other languages (including EN_USA)
+	int language = _vm->_global->_language <= 4 ? _vm->_global->_language : 2;
 	for (int i = 0; i < ARRAYSIZE(tracks); i++)
 		if (!scumm_stricmp(_vm->_game->_curTotFile, tracks[i][0])) {
-			startTrack(tracks[i][_vm->_global->_language + 1]);
+			startTrack(tracks[i][language + 1]);
 			break;
 		}
 }


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