summaryrefslogtreecommitdiff
path: root/src/cargotype.cpp
diff options
context:
space:
mode:
authorterkhen <terkhen@openttd.org>2010-04-01 19:48:28 +0000
committerterkhen <terkhen@openttd.org>2010-04-01 19:48:28 +0000
commit4ec8fed1da87b79dda5edd6cc7c052379c7b8c4e (patch)
tree87d9b6a57e05d8173f3a712a6ca7b21802cf2602 /src/cargotype.cpp
parente1c68f1b2c303617894070ba499c277635af2639 (diff)
downloadopenttd-4ec8fed1da87b79dda5edd6cc7c052379c7b8c4e.tar.xz
(svn r19534) -Add: Keep a list of cargo specifications sorted by cargo class / name.
Diffstat (limited to 'src/cargotype.cpp')
-rw-r--r--src/cargotype.cpp50
1 files changed, 50 insertions, 0 deletions
diff --git a/src/cargotype.cpp b/src/cargotype.cpp
index 3e2e742d0..01b5f425f 100644
--- a/src/cargotype.cpp
+++ b/src/cargotype.cpp
@@ -13,6 +13,8 @@
#include "cargotype.h"
#include "core/bitmath_func.hpp"
#include "newgrf_cargo.h"
+#include "strings_func.h"
+#include "core/sort_func.hpp"
#include "table/sprites.h"
#include "table/strings.h"
@@ -113,3 +115,51 @@ SpriteID CargoSpec::GetCargoIcon() const
return sprite;
}
+const CargoSpec *_sorted_cargo_specs[NUM_CARGO]; ///< Cargo specifications sorted alphabetically by name.
+uint8 _sorted_cargo_specs_size; ///< Number of cargo specifications stored at the _sorted_cargo_specs array.
+
+/** Sort cargo specifications by their name. */
+static int CDECL CargoSpecNameSorter(const CargoSpec * const *a, const CargoSpec * const *b)
+{
+ static char a_name[64];
+ static char b_name[64];
+
+ GetString(a_name, (*a)->name, lastof(a_name));
+ GetString(b_name, (*b)->name, lastof(b_name));
+
+ int res = strcmp(a_name, b_name);
+
+ /* If the names are equal, sort by cargo bitnum. */
+ return (res != 0) ? res : ((*a)->bitnum - (*b)->bitnum);
+}
+
+/** Sort cargo specifications by their cargo class. */
+static int CDECL CargoSpecClassSorter(const CargoSpec * const *a, const CargoSpec * const *b)
+{
+ int res = ((*b)->classes & CC_PASSENGERS) - ((*a)->classes & CC_PASSENGERS);
+ if (res == 0) {
+ res = ((*b)->classes & CC_MAIL) - ((*a)->classes & CC_MAIL);
+ if (res == 0) {
+ return CargoSpecNameSorter(a, b);
+ }
+ }
+
+ return res;
+}
+
+/** Initialize the list of sorted cargo specifications. */
+void InitializeSortedCargoSpecs()
+{
+ _sorted_cargo_specs_size = 0;
+ CargoSpec *cargo;
+ /* Add each cargo spec to the list. */
+ FOR_ALL_CARGOSPECS(cargo) {
+ if ((cargo->classes & CC_SPECIAL) != 0) continue; // Exclude fake cargo types.
+ _sorted_cargo_specs[_sorted_cargo_specs_size] = cargo;
+ _sorted_cargo_specs_size++;
+ }
+
+ /* Sort cargo specifications by cargo class and name. */
+ QSortT(_sorted_cargo_specs, _sorted_cargo_specs_size, &CargoSpecClassSorter);
+}
+