From 8f77efae960b69cddef85a3fc01ad25552357677 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 26 Jan 2016 02:41:11 +0100
Subject: FULLPIPE: Only request actual save slots in listSaves.

---
 engines/fullpipe/detection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/fullpipe/detection.cpp')

diff --git a/engines/fullpipe/detection.cpp b/engines/fullpipe/detection.cpp
index de0ed04d25..ccd55935e6 100644
--- a/engines/fullpipe/detection.cpp
+++ b/engines/fullpipe/detection.cpp
@@ -108,7 +108,7 @@ bool FullpipeMetaEngine::hasFeature(MetaEngineFeature f) const {
 SaveStateList FullpipeMetaEngine::listSaves(const char *target) const {
 	Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
 	Common::StringArray filenames;
-	Common::String pattern("fullpipe.s??");
+	Common::String pattern("fullpipe.s##");
 
 	filenames = saveFileMan->listSavefiles(pattern);
 	sort(filenames.begin(), filenames.end());	// Sort (hopefully ensuring we are sorted numerically..)
-- 
cgit v1.2.3


From e5feb43392f02917f7482a935dc4f04b1f0be250 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 25 Feb 2016 19:55:13 +0100
Subject: FULLPIPE: Let listSaves return list sorted on slot numbers.

---
 engines/fullpipe/detection.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'engines/fullpipe/detection.cpp')

diff --git a/engines/fullpipe/detection.cpp b/engines/fullpipe/detection.cpp
index ccd55935e6..99fbdc4b82 100644
--- a/engines/fullpipe/detection.cpp
+++ b/engines/fullpipe/detection.cpp
@@ -111,7 +111,6 @@ SaveStateList FullpipeMetaEngine::listSaves(const char *target) const {
 	Common::String pattern("fullpipe.s##");
 
 	filenames = saveFileMan->listSavefiles(pattern);
-	sort(filenames.begin(), filenames.end());	// Sort (hopefully ensuring we are sorted numerically..)
 
 	SaveStateList saveList;
 	for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
@@ -130,6 +129,8 @@ SaveStateList FullpipeMetaEngine::listSaves(const char *target) const {
 		}
 	}
 
+	// Sort saves based on slot number.
+	Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
 	return saveList;
 }
 
-- 
cgit v1.2.3


From 0b6befdcc5f5f8d6d5deb2831104fb7abc0f7466 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 8 Mar 2016 18:30:58 +0100
Subject: ENGINES: Make variable names of AdvancedMetaEngine conform to our
 guidelines.

_singleid   -> _singleId
_gameids    -> _gameIds
_guioptions -> _guiOptions
---
 engines/fullpipe/detection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/fullpipe/detection.cpp')

diff --git a/engines/fullpipe/detection.cpp b/engines/fullpipe/detection.cpp
index 99fbdc4b82..a865e9ad06 100644
--- a/engines/fullpipe/detection.cpp
+++ b/engines/fullpipe/detection.cpp
@@ -76,7 +76,7 @@ static const ADGameDescription gameDescriptions[] = {
 class FullpipeMetaEngine : public AdvancedMetaEngine {
 public:
 	FullpipeMetaEngine() : AdvancedMetaEngine(Fullpipe::gameDescriptions, sizeof(ADGameDescription), fullpipeGames) {
-		_singleid = "fullpipe";
+		_singleId = "fullpipe";
 	}
 
 	virtual const char *getName() const {
-- 
cgit v1.2.3


From 3aecd8ef2a79dbbd43dd0e39e42b11409720361f Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 8 Mar 2016 18:53:55 +0100
Subject: ENGINES: Make variable names of ADGameDescription conform to our
 guidelines.

gameid     -> gameId
guioptions -> guiOptions
---
 engines/fullpipe/detection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/fullpipe/detection.cpp')

diff --git a/engines/fullpipe/detection.cpp b/engines/fullpipe/detection.cpp
index a865e9ad06..6f92f19f24 100644
--- a/engines/fullpipe/detection.cpp
+++ b/engines/fullpipe/detection.cpp
@@ -32,7 +32,7 @@
 namespace Fullpipe {
 
 const char *FullpipeEngine::getGameId() const {
-	return _gameDescription->gameid;
+	return _gameDescription->gameId;
 }
 
 }
-- 
cgit v1.2.3