[Scummvm-git-logs] scummvm master -> c17f25d1abeb1407d3da17206dfe380ee7bab37f

[mgerhardy]

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

Summary:
47162088a5 GUI: fixed typo in documentation
ef6e6b6451 GUI: doxygen
c17f25d1ab GUI: sort the event recorder files


Commit: 47162088a57a883d1012ddfa6916058deb305d96
    https://github.com/scummvm/scummvm/commit/47162088a57a883d1012ddfa6916058deb305d96
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-07-07T19:19:36+02:00

Commit Message:
GUI: fixed typo in documentation

Changed paths:
    gui/EventRecorder.h


diff --git a/gui/EventRecorder.h b/gui/EventRecorder.h
index bf8599d9a1..e8aeafeecb 100644
--- a/gui/EventRecorder.h
+++ b/gui/EventRecorder.h
@@ -74,7 +74,7 @@ public:
 		kPassthrough = 0,		/**< kPassthrough, do nothing */
 		kRecorderRecord = 1,		/**< kRecorderRecord, do the recording */
 		kRecorderPlayback = 2,		/**< kRecorderPlayback, playback existing recording */
-		kRecorderPlaybackPause = 3	/**< kRecordetPlaybackPause, interal state when user pauses the playback */
+		kRecorderPlaybackPause = 3	/**< kRecordetPlaybackPause, internal state when user pauses the playback */
 	};
 
 	void init(const Common::String &recordFileName, RecordMode mode);


Commit: ef6e6b64510d2e45fe75dcb13fdf444c1cbb961c
    https://github.com/scummvm/scummvm/commit/ef6e6b64510d2e45fe75dcb13fdf444c1cbb961c
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-07-07T19:19:43+02:00

Commit Message:
GUI: doxygen

Changed paths:
    common/events.h
    gui/EventRecorder.h


diff --git a/common/events.h b/common/events.h
index fb98674cc0..a392611e05 100644
--- a/common/events.h
+++ b/common/events.h
@@ -293,7 +293,7 @@ public:
 	}
 
 	bool pollEvent(Event &ev) {
-	if (!_artificialEventQueue.empty()) {
+		if (!_artificialEventQueue.empty()) {
 			ev = _artificialEventQueue.pop();
 			return true;
 		} else {
diff --git a/gui/EventRecorder.h b/gui/EventRecorder.h
index e8aeafeecb..7412ede64c 100644
--- a/gui/EventRecorder.h
+++ b/gui/EventRecorder.h
@@ -212,6 +212,10 @@ private:
 	bool checkGameHash(const ADGameDescription *desc);
 
 	void checkForKeyCode(const Common::Event &event);
+	/**
+	 * @return false because we don't want to remap the given event again. This already happened on
+	 * recording the event. We record the custom events already, not the raw backend events.
+	 */
 	bool allowMapping() const override { return false; }
 
 	volatile uint32 _lastMillis;


Commit: c17f25d1abeb1407d3da17206dfe380ee7bab37f
    https://github.com/scummvm/scummvm/commit/c17f25d1abeb1407d3da17206dfe380ee7bab37f
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-07-07T19:20:10+02:00

Commit Message:
GUI: sort the event recorder files

the default name only contains the date and the game id. Combined
with the random sort of the filesystem, it is almost impossible to
select the 'latest' record of the same game at the same day.

Changed paths:
    gui/recorderdialog.cpp


diff --git a/gui/recorderdialog.cpp b/gui/recorderdialog.cpp
index d9d8a047e2..19a83c8959 100644
--- a/gui/recorderdialog.cpp
+++ b/gui/recorderdialog.cpp
@@ -201,6 +201,7 @@ void RecorderDialog::updateList() {
 	Common::StringArray files = saveFileMan->listSavefiles(pattern);
 	Common::PlaybackFile file;
 	Common::U32StringArray namesList;
+	Common::sort(files.begin(), files.end());
 	_fileHeaders.clear();
 	for (Common::StringArray::iterator i = files.begin(); i != files.end(); ++i) {
 		if (file.openRead(*i)) {