# HG changeset patch # User tron # Date 1134669359 0 # Node ID d579caf58b5949bb79f47a57fc68970c6a179e9c # Parent 1582d056d434a6031b8f36c0b49fa7a33f7766ad (svn r3308) BAD foo.h: int bar; GOOD foo.h: extern int bar; foo.c: int bar; diff -r 1582d056d434 -r d579caf58b59 bridge.h --- a/bridge.h Wed Dec 14 20:45:12 2005 +0000 +++ b/bridge.h Thu Dec 15 17:55:59 2005 +0000 @@ -20,6 +20,6 @@ } Bridge; extern const Bridge orig_bridge[MAX_BRIDGES]; -Bridge _bridge[MAX_BRIDGES]; +extern Bridge _bridge[MAX_BRIDGES]; #endif /* BRIDGE_H */ diff -r 1582d056d434 -r d579caf58b59 engine.c --- a/engine.c Wed Dec 14 20:45:12 2005 +0000 +++ b/engine.c Thu Dec 15 17:55:59 2005 +0000 @@ -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 -r 1582d056d434 -r d579caf58b59 engine.h --- a/engine.h Wed Dec 14 20:45:12 2005 +0000 +++ b/engine.h Thu Dec 15 17:55:59 2005 +0000 @@ -251,11 +251,11 @@ 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 -r 1582d056d434 -r d579caf58b59 tunnelbridge_cmd.c --- a/tunnelbridge_cmd.c Wed Dec 14 20:45:12 2005 +0000 +++ b/tunnelbridge_cmd.c Thu Dec 15 17:55:59 2005 +0000 @@ -55,6 +55,9 @@ { 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)