From dc90b2873aecf00ae7d3e5aae511f6a2aff61f85 Mon Sep 17 00:00:00 2001
From: hokasha2016 <46494088+hokasha2016@users.noreply.github.com>
Date: Tue, 2 Apr 2019 18:16:47 -0400
Subject: [PATCH] Sort files in logical rather than dictionary order (#9012)

---
 contributors.md                      | 4 ++++
 distribution/changelog.txt           | 1 +
 src/openrct2-ui/windows/LoadSave.cpp | 6 +++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/contributors.md b/contributors.md
index 3d0a468e0c..2aa925ae12 100644
--- a/contributors.md
+++ b/contributors.md
@@ -121,6 +121,10 @@ The following people are not part of the development team, but have been contrib
 * Jason Myre (jmyre1999)
 * Nicole Wright (nicolewright)
 * Josh Tucker (joshtucker132)
+* Hussein Okasha (Hokasha2016)
+* Brandon Dupree (Bdupree5)
+* Zetao Ye (ZbrettonYe)
+* Jordan Arevalos (Jarevalos2017)
 
 ## Toolchain
 * (Balletie) - macOS
diff --git a/distribution/changelog.txt b/distribution/changelog.txt
index 1053d9e35d..db6780ec30 100644
--- a/distribution/changelog.txt
+++ b/distribution/changelog.txt
@@ -5,6 +5,7 @@
 - Feature: [#8481] Multi-threaded rendering.
 - Feature: [#8919] Allow setting ride price from console.
 - Feature: [#8963] Add missing Czech letters to sprite font, use sprite font for Czech.
+- Change: [#7877] Files are now sorted in logical rather than dictionary order.
 - Change: [#8688] Move common actions from debug menu into cheats menu.
 - Fix: [#5579] Network desync immediately after connecting.
 - Fix: [#5905] Urban Park merry-go-round has entrance and exit swapped (original bug).
diff --git a/src/openrct2-ui/windows/LoadSave.cpp b/src/openrct2-ui/windows/LoadSave.cpp
index 2432414cfa..5328622c8d 100644
--- a/src/openrct2-ui/windows/LoadSave.cpp
+++ b/src/openrct2-ui/windows/LoadSave.cpp
@@ -786,15 +786,15 @@ static bool list_item_sort(LoadSaveListItem& a, LoadSaveListItem& b)
     switch (gConfigGeneral.load_save_sort)
     {
         case SORT_NAME_ASCENDING:
-            return strcicmp(a.name.c_str(), b.name.c_str()) < 0;
+            return strlogicalcmp(a.name.c_str(), b.name.c_str()) < 0;
         case SORT_NAME_DESCENDING:
-            return -strcicmp(a.name.c_str(), b.name.c_str()) < 0;
+            return -strlogicalcmp(a.name.c_str(), b.name.c_str()) < 0;
         case SORT_DATE_DESCENDING:
             return -difftime(a.date_modified, b.date_modified) < 0;
         case SORT_DATE_ASCENDING:
             return difftime(a.date_modified, b.date_modified) < 0;
         default:
-            return strcicmp(a.name.c_str(), b.name.c_str()) < 0;
+            return strlogicalcmp(a.name.c_str(), b.name.c_str()) < 0;
     }
 }