summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@openttd.org>2005-12-15 17:55:59 +0000
committertron <tron@openttd.org>2005-12-15 17:55:59 +0000
commit28fe368b7fee701d92c2c459c28bcaeae7f43235 (patch)
treea7149cdbdf03a226b7a04ea8a0343d8dea79ec0b
parentca52ec33b215834a20a5a1ef327da773a7f8e2c3 (diff)
downloadopenttd-28fe368b7fee701d92c2c459c28bcaeae7f43235.tar.xz
(svn r3308) BAD
foo.h: int bar; GOOD foo.h: extern int bar; foo.c: int bar;
-rw-r--r--bridge.h2
-rw-r--r--engine.c6
-rw-r--r--engine.h10
-rw-r--r--tunnelbridge_cmd.c3
4 files changed, 15 insertions, 6 deletions
diff --git a/bridge.h b/bridge.h
index c3a2f4c57..79ea4fbde 100644
--- a/bridge.h
+++ b/bridge.h
@@ -20,6 +20,6 @@ typedef struct Bridge {
} Bridge;
extern const Bridge orig_bridge[MAX_BRIDGES];
-Bridge _bridge[MAX_BRIDGES];
+extern Bridge _bridge[MAX_BRIDGES];
#endif /* BRIDGE_H */
diff --git a/engine.c b/engine.c
index acb4558a1..9b39f2891 100644
--- a/engine.c
+++ b/engine.c
@@ -19,6 +19,12 @@
#include "variables.h"
#include "train.h"
+EngineInfo _engine_info[TOTAL_NUM_ENGINES];
+RailVehicleInfo _rail_vehicle_info[NUM_TRAIN_ENGINES];
+ShipVehicleInfo _ship_vehicle_info[NUM_SHIP_ENGINES];
+AircraftVehicleInfo _aircraft_vehicle_info[NUM_AIRCRAFT_ENGINES];
+RoadVehicleInfo _road_vehicle_info[NUM_ROAD_ENGINES];
+
enum {
ENGINE_AVAILABLE = 1,
ENGINE_INTRODUCING = 2,
diff --git a/engine.h b/engine.h
index 4da78bf88..c312bc09d 100644
--- a/engine.h
+++ b/engine.h
@@ -251,11 +251,11 @@ extern const ShipVehicleInfo orig_ship_vehicle_info[NUM_SHIP_ENGINES];
extern const AircraftVehicleInfo orig_aircraft_vehicle_info[NUM_AIRCRAFT_ENGINES];
extern const RoadVehicleInfo orig_road_vehicle_info[NUM_ROAD_ENGINES];
-EngineInfo _engine_info[TOTAL_NUM_ENGINES];
-RailVehicleInfo _rail_vehicle_info[NUM_TRAIN_ENGINES];
-ShipVehicleInfo _ship_vehicle_info[NUM_SHIP_ENGINES];
-AircraftVehicleInfo _aircraft_vehicle_info[NUM_AIRCRAFT_ENGINES];
-RoadVehicleInfo _road_vehicle_info[NUM_ROAD_ENGINES];
+extern EngineInfo _engine_info[TOTAL_NUM_ENGINES];
+extern RailVehicleInfo _rail_vehicle_info[NUM_TRAIN_ENGINES];
+extern ShipVehicleInfo _ship_vehicle_info[NUM_SHIP_ENGINES];
+extern AircraftVehicleInfo _aircraft_vehicle_info[NUM_AIRCRAFT_ENGINES];
+extern RoadVehicleInfo _road_vehicle_info[NUM_ROAD_ENGINES];
static inline const RailVehicleInfo* RailVehInfo(EngineID e)
{
diff --git a/tunnelbridge_cmd.c b/tunnelbridge_cmd.c
index ae7268507..88d9d2d2e 100644
--- a/tunnelbridge_cmd.c
+++ b/tunnelbridge_cmd.c
@@ -55,6 +55,9 @@ const Bridge orig_bridge[] = {
{ 90, 2, 32, 510, 608, 0xA28 | PALETTE_TO_STRUCT_GREY , STR_BRIDGE_TUBULAR_SILICON , NULL, 0 }
};
+Bridge _bridge[MAX_BRIDGES];
+
+
// calculate the price factor for building a long bridge.
// basically the cost delta is 1,1, 1, 2,2, 3,3,3, 4,4,4,4, 5,5,5,5,5, 6,6,6,6,6,6, 7,7,7,7,7,7,7, 8,8,8,8,8,8,8,8,
int CalcBridgeLenCostFactor(int x)