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

Strangerke Strangerke at scummvm.org
Sat May 4 19:43:16 CEST 2013


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:
b299481660 HOPKINS: Workaround for bug #3612611 - Missing credit file in BeOS version!


Commit: b29948166024488adfb08ee3269b11281e698d5f
    https://github.com/scummvm/scummvm/commit/b29948166024488adfb08ee3269b11281e698d5f
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-05-04T10:41:58-07:00

Commit Message:
HOPKINS: Workaround for bug #3612611 - Missing credit file in BeOS version!

Changed paths:
    engines/hopkins/hopkins.cpp



diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index e816855..91b3a17 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -2356,21 +2356,29 @@ void HopkinsEngine::loadCredits() {
 	_globals->_creditsPosY = 440;
 	_globals->_creditsStep = 45;
 	byte *bufPtr;
+	Common::String filename;
 	switch (_globals->_language) {
 	case LANG_EN:
-		bufPtr = _fileIO->loadFile("CREAN.TXT");
+		filename = "CREAN.TXT";
 		break;
 	case LANG_FR:
-		bufPtr = _fileIO->loadFile("CREFR.TXT");
+		filename = "CREFR.TXT";
 		break;
 	case LANG_SP:
-		bufPtr = _fileIO->loadFile("CREES.TXT");
+		filename = "CREES.TXT";
 		break;
 	default:
 		error("Unhandled language");
 		break;
 	}
 
+	if (!_fileIO->fileExists(filename)) {
+		_globals->_creditsLineNumb = 0;
+		return;
+	}
+
+	bufPtr = _fileIO->loadFile(filename);
+
 	byte *curPtr = bufPtr;
 	int idxLines = 0;
 	bool loopCond = false;






More information about the Scummvm-git-logs mailing list