[Scummvm-git-logs] scummvm master -> 95f46e389256ea6e4cc064b8b4af0b4db86d6d06

whiterandrek whiterandrek at gmail.com
Thu Jul 5 11:07:14 CEST 2018


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:
95f46e3892 PINK: fixed loading games after recent changes


Commit: 95f46e389256ea6e4cc064b8b4af0b4db86d6d06
    https://github.com/scummvm/scummvm/commit/95f46e389256ea6e4cc064b8b4af0b4db86d6d06
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2018-07-05T12:06:57+03:00

Commit Message:
PINK: fixed loading games after recent changes

Changed paths:
    engines/pink/pink.cpp


diff --git a/engines/pink/pink.cpp b/engines/pink/pink.cpp
index e7d4472..1748b28 100644
--- a/engines/pink/pink.cpp
+++ b/engines/pink/pink.cpp
@@ -73,13 +73,15 @@ Common::Error PinkEngine::init() {
 
 	_console = new Console(this);
 
-	const Common::String orbName = _desc.filesDescriptions[0].fileName;
-	const Common::String broName = _desc.filesDescriptions[1].fileName;
-
-	if (isPeril())
-		_bro = new BroFile();
-	else
-		debug("This game doesn't need to use bro");
+	Common::String orbName;
+	Common::String broName;
+	if (isPeril()) {
+		orbName = "PPTP.ORB";
+		broName = "PPTP.BRO";
+		_bro = new BroFile;
+	} else {
+		orbName = "HPP.ORB";
+	}
 
 	if (!_orb.open(orbName) || (_bro && !_bro->open(broName) && _orb.getTimestamp() == _bro->getTimestamp()))
 		return Common::kNoGameDataFoundError;
@@ -215,7 +217,7 @@ bool PinkEngine::checkValueOfVariable(Common::String &variable, Common::String &
 bool PinkEngine::loadCursors() {
 	Common::PEResources exeResources;
 	bool isPokus = !isPeril();
-	Common::String fileName = isPokus ? _desc.filesDescriptions[1].fileName : _desc.filesDescriptions[2].fileName;
+	Common::String fileName = isPokus ? "hpp.exe" : "pptp.exe";
 	if (!exeResources.loadFromEXE(fileName))
 		return false;
 





More information about the Scummvm-git-logs mailing list