4 files changed, 27 insertions, 36 deletions
diff --git a/src/pathfinder/npf/npf.h b/src/pathfinder/npf/npf.h
index fb10c07ec..61a4409a1 100644
--- a/src/pathfinder/npf/npf.h
+++ b/src/pathfinder/npf/npf.h
@@ -31,24 +31,6 @@ enum {
 	NPF_HASH_HALFMASK = (1 << NPF_HASH_HALFBITS) - 1
 };
 
-/* For new pathfinding. Define here so it is globally available without having
- * to include npf.h */
-enum {
-	NPF_TILE_LENGTH = 100
-};
-
-enum {
-	/**
-	 * This penalty is the equivalent of "infite", which means that paths that
-	 * get this penalty will be chosen, but only if there is no other route
-	 * without it. Be careful with not applying this penalty to often, or the
-	 * total path cost might overflow..
-	 * For now, this is just a Very Big Penalty, we might actually implement
-	 * this in a nicer way :-)
-	 */
-	NPF_INFINITE_PENALTY = 1000 * NPF_TILE_LENGTH
-};
-
 /* Meant to be stored in AyStar.targetdata */
 struct NPFFindStationOrTileData {
 	TileIndex dest_coords;   ///< An indication of where the station is, for heuristic purposes, or the target tile
diff --git a/src/pathfinder/pathfinder_type.h b/src/pathfinder/pathfinder_type.h
index 95daf533e..0bb3f2e5d 100644
--- a/src/pathfinder/pathfinder_type.h
+++ b/src/pathfinder/pathfinder_type.h
@@ -12,6 +12,32 @@
 #ifndef PATHFINDER_TYPE_H
 #define PATHFINDER_TYPE_H
 
+/** Length (penalty) of one tile with NPF */
+static const int NPF_TILE_LENGTH = 100;
+
+/**
+ * This penalty is the equivalent of "infite", which means that paths that
+ * get this penalty will be chosen, but only if there is no other route
+ * without it. Be careful with not applying this penalty to often, or the
+ * total path cost might overflow..
+ */
+static const int NPF_INFINITE_PENALTY = 1000 * NPF_TILE_LENGTH;
+
+
+/** Length (penalty) of one tile with YAPF */
+static const int YAPF_TILE_LENGTH = 100;
+
+/** Length (penalty) of a corner with YAPF */
+static const int YAPF_TILE_CORNER_LENGTH = 71;
+
+/**
+ * This penalty is the equivalent of "infite", which means that paths that
+ * get this penalty will be chosen, but only if there is no other route
+ * without it. Be careful with not applying this penalty to often, or the
+ * total path cost might overflow..
+ */
+static const int YAPF_INFINITE_PENALTY = 1000 * YAPF_TILE_LENGTH;
+
 /**
  * Helper container to find a depot
  */
diff --git a/src/pathfinder/yapf/yapf.h b/src/pathfinder/yapf/yapf.h
index 337cb02b5..2faf5e56a 100644
--- a/src/pathfinder/yapf/yapf.h
+++ b/src/pathfinder/yapf/yapf.h
@@ -105,20 +105,4 @@ bool YapfTrainFindNearestSafeTile(const Train *v, TileIndex tile, Trackdir td, b
 /** Use this function to notify YAPF that track layout (or signal configuration) has change */
 void YapfNotifyTrackLayoutChange(TileIndex tile, Track track);
 
-/** Base tile length units */
-enum {
-	YAPF_TILE_LENGTH = 100,
-	YAPF_TILE_CORNER_LENGTH = 71,
-
-	/**
-	 * This penalty is the equivalent of "infite", which means that paths that
-	 * get this penalty will be chosen, but only if there is no other route
-	 * without it. Be careful with not applying this penalty to often, or the
-	 * total path cost might overflow..
-	 * For now, this is just a Very Big Penalty, we might actually implement
-	 * this in a nicer way :-)
-	 */
-	YAPF_INFINITE_PENALTY = 1000 * YAPF_TILE_LENGTH,
-};
-
 #endif /* YAPF_H */
diff --git a/src/settings.cpp b/src/settings.cpp
index 0f9e36a5d..d4980b07e 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -31,8 +31,7 @@
 #include "settings_internal.h"
 #include "command_func.h"
 #include "console_func.h"
-#include "pathfinder/npf/npf.h"
-#include "pathfinder/yapf/yapf.h"
+#include "pathfinder/pathfinder_type.h"
 #include "genworld.h"
 #include "train.h"
 #include "news_func.h"