# HG changeset patch # User celestar # Date 1143659027 0 # Node ID 633290bf11174950fdd08ec1f8f3374b76138ff9 # Parent c69b64a580b2c350da27e39689512cb94456943a (svn r4154) -Moved MAX_BRIDGES in bridge.h and made it an enum. This makes two drops ... diff -r c69b64a580b2 -r 633290bf1117 ai/default/default.c --- a/ai/default/default.c Wed Mar 29 19:00:56 2006 +0000 +++ b/ai/default/default.c Wed Mar 29 19:03:47 2006 +0000 @@ -22,6 +22,7 @@ #include "../../airport.h" #include "../../depot.h" #include "../../variables.h" +#include "../../bridge.h" #include "default.h" // remove some day perhaps? diff -r c69b64a580b2 -r 633290bf1117 ai/trolly/build.c --- a/ai/trolly/build.c Wed Mar 29 19:00:56 2006 +0000 +++ b/ai/trolly/build.c Wed Mar 29 19:03:47 2006 +0000 @@ -12,6 +12,7 @@ #include "../../engine.h" #include "../../station.h" #include "../../variables.h" +#include "../../bridge.h" #include "../ai.h" // Build HQ diff -r c69b64a580b2 -r 633290bf1117 ai/trolly/pathfinder.c --- a/ai/trolly/pathfinder.c Wed Mar 29 19:00:56 2006 +0000 +++ b/ai/trolly/pathfinder.c Wed Mar 29 19:03:47 2006 +0000 @@ -11,7 +11,7 @@ #include "trolly.h" #include "../../depot.h" #include "../../tunnel_map.h" -#include "../../variables.h" +#include "../../bridge.h" #include "../ai.h" #define TEST_STATION_NO_DIR 0xFF diff -r c69b64a580b2 -r 633290bf1117 bridge.h --- a/bridge.h Wed Mar 29 19:00:56 2006 +0000 +++ b/bridge.h Wed Mar 29 19:03:47 2006 +0000 @@ -5,6 +5,10 @@ #ifndef BRIDGE_H #define BRIDGE_H +enum { + MAX_BRIDGES = 13 +}; + /** Struct containing information about a single bridge type */ typedef struct Bridge { diff -r c69b64a580b2 -r 633290bf1117 town_cmd.c --- a/town_cmd.c Wed Mar 29 19:00:56 2006 +0000 +++ b/town_cmd.c Wed Mar 29 19:03:47 2006 +0000 @@ -24,6 +24,7 @@ #include "gui.h" #include "unmovable_map.h" #include "variables.h" +#include "bridge.h" enum { /* Max towns: 64000 (8 * 8000) */ diff -r c69b64a580b2 -r 633290bf1117 variables.h --- a/variables.h Wed Mar 29 19:00:56 2006 +0000 +++ b/variables.h Wed Mar 29 19:03:47 2006 +0000 @@ -414,9 +414,6 @@ VARDEF char _screenshot_name[128]; VARDEF byte _vehicle_design_names; -/* tunnelbridge */ -#define MAX_BRIDGES 13 - /* Forking stuff */ VARDEF bool _dedicated_forks;