diff options
| -rw-r--r-- | npf.h | 7 | ||||
| -rw-r--r-- | settings.c | 1 | ||||
| -rw-r--r-- | variables.h | 4 |
3 files changed, 7 insertions, 5 deletions
@@ -8,7 +8,6 @@ #include "station.h" #include "vehicle.h" #include "tile.h" -#include "variables.h" //mowing grass enum { @@ -19,6 +18,12 @@ 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 "inifite", which means that paths that * get this penalty will be chosen, but only if there is no other route diff --git a/settings.c b/settings.c index 02b4dff28..fa478b567 100644 --- a/settings.c +++ b/settings.c @@ -14,6 +14,7 @@ #include "command.h" #include "console.h" #include "saveload.h" +#include "npf.h" /** The patch values that are used for new games and/or modified in config file */ Patches _patches_newgame; diff --git a/variables.h b/variables.h index b63a0cee7..47387ba5d 100644 --- a/variables.h +++ b/variables.h @@ -417,10 +417,6 @@ VARDEF byte _vehicle_design_names; /* tunnelbridge */ #define MAX_BRIDGES 13 -/* For new pathfinding. Define here so it is globally available without having - * to include npf.h */ -#define NPF_TILE_LENGTH 100 - /* Forking stuff */ VARDEF bool _dedicated_forks; |