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

[m-kiewitz]

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:
cedcdbc48d SCI: Add getGameObjectName to fix compilation


Commit: cedcdbc48d391537e4bd867d60665f72b1528a67
    https://github.com/scummvm/scummvm/commit/cedcdbc48d391537e4bd867d60665f72b1528a67
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2016-06-25T23:59:46+02:00

Commit Message:
SCI: Add getGameObjectName to fix compilation

Is needed for 80462b3 (Fix auto-saving in the fan-made Cascade Quest)

Changed paths:
    engines/sci/sci.cpp
    engines/sci/sci.h



diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index e650b4b..b80456c 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -913,6 +913,10 @@ Common::String SciEngine::unwrapFilename(const Common::String &name) const {
 	return name;
 }
 
+const char *SciEngine::getGameObjectName() {
+	return _gamestate->_segMan->getObjectName(_gameObjectAddress);
+}
+
 int SciEngine::inQfGImportRoom() const {
 	if (_gameId == GID_QFG2 && _gamestate->currentRoomNumber() == 805) {
 		// QFG2 character import screen
diff --git a/engines/sci/sci.h b/engines/sci/sci.h
index cc26db3..956187c 100644
--- a/engines/sci/sci.h
+++ b/engines/sci/sci.h
@@ -303,6 +303,8 @@ public:
 	/** Remove the 'TARGET-' prefix of the given filename, if present. */
 	Common::String unwrapFilename(const Common::String &name) const;
 
+	const char *getGameObjectName(); // Gets the name of the game object (should only be used for identifying fanmade games)
+
 	/**
 	 * Checks if we are in a QfG import screen, where special handling
 	 * of file-listings is performed.