[Scummvm-cvs-logs] scummvm master -> 7a290757a8ef9ae16d27a2eecf000a9ca8005a21

lordhoto lordhoto at gmail.com
Sat Apr 2 23:12:39 CEST 2016


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
cf73ea5395 SCUMM: Expose COMI's object_labels setting as an extra GUI option
7a290757a8 Merge pull request #739 from salty-horse/comi_object_labels_setting


Commit: cf73ea539581f5c07ce1a0af937dd442dabd7ecf
    https://github.com/scummvm/scummvm/commit/cf73ea539581f5c07ce1a0af937dd442dabd7ecf
Author: Ori Avtalion (ori at avtalion.name)
Date: 2016-04-01T21:38:50+03:00

Commit Message:
SCUMM: Expose COMI's object_labels setting as an extra GUI option

Changed paths:
    engines/scumm/POTFILES
    engines/scumm/detection.cpp



diff --git a/engines/scumm/POTFILES b/engines/scumm/POTFILES
index 246f14d..039aa16 100644
--- a/engines/scumm/POTFILES
+++ b/engines/scumm/POTFILES
@@ -1,3 +1,4 @@
+engines/scumm/detection.cpp
 engines/scumm/dialogs.cpp
 engines/scumm/help.cpp
 engines/scumm/input.cpp
diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index 9264a64..0867b20 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -29,6 +29,7 @@
 #include "common/md5.h"
 #include "common/savefile.h"
 #include "common/system.h"
+#include "common/translation.h"
 
 #include "audio/mididrv.h"
 
@@ -957,6 +958,7 @@ public:
 	virtual int getMaximumSaveSlot() const;
 	virtual void removeSaveState(const char *target, int slot) const;
 	virtual SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
+	virtual const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const;
 };
 
 bool ScummMetaEngine::hasFeature(MetaEngineFeature f) const {
@@ -1329,6 +1331,21 @@ SaveStateDescriptor ScummMetaEngine::querySaveMetaInfos(const char *target, int
 	return desc;
 }
 
+static const ExtraGuiOption comiObjectLabelsOption = {
+	_s("Show Object Line"),
+	_s("Show the names of objects at the bottom of the screen"),
+	"object_labels",
+	true
+};
+
+const ExtraGuiOptions ScummMetaEngine::getExtraGuiOptions(const Common::String &target) const {
+	ExtraGuiOptions options;
+	if (target.empty() || ConfMan.get("gameid", target) == "comi") {
+		options.push_back(comiObjectLabelsOption);
+	}
+	return options;
+}
+
 #if PLUGIN_ENABLED_DYNAMIC(SCUMM)
 	REGISTER_PLUGIN_DYNAMIC(SCUMM, PLUGIN_TYPE_ENGINE, ScummMetaEngine);
 #else


Commit: 7a290757a8ef9ae16d27a2eecf000a9ca8005a21
    https://github.com/scummvm/scummvm/commit/7a290757a8ef9ae16d27a2eecf000a9ca8005a21
Author: Johannes Schickel (lordhoto at gmail.com)
Date: 2016-04-02T23:12:35+02:00

Commit Message:
Merge pull request #739 from salty-horse/comi_object_labels_setting

SCUMM: Add checkbox for object_labels setting in "Edit Game" dialog

Changed paths:
    engines/scumm/POTFILES
    engines/scumm/detection.cpp









More information about the Scummvm-git-logs mailing list