From 24986e9144a20a08c59b4d84dd35fc746b00bd19 Mon Sep 17 00:00:00 2001 From: ludde Date: Fri, 29 Jul 2005 22:13:04 +0000 Subject: [PATCH] (svn r2756) Renamed railtypes into _railtypes Renamed railtypes.c into railtypes.h, all other tables are in .h files. (It should be in the tables dir but I couldn't figure out how to get it there without deleting it first). Added const and extern. --- Makefile | 1 - rail.h | 6 +++--- rail_cmd.c | 1 + railtypes.c => railtypes.h | 9 ++------- 4 files changed, 6 insertions(+), 11 deletions(-) rename railtypes.c => railtypes.h (86%) diff --git a/Makefile b/Makefile index bc11b0de2e..018278c317 100644 --- a/Makefile +++ b/Makefile @@ -670,7 +670,6 @@ C_SOURCES += queue.c C_SOURCES += rail.c C_SOURCES += rail_cmd.c C_SOURCES += rail_gui.c -C_SOURCES += railtypes.c C_SOURCES += rev.c C_SOURCES += road_cmd.c C_SOURCES += road_gui.c diff --git a/rail.h b/rail.h index 387fc3fb45..631d35e4b8 100644 --- a/rail.h +++ b/rail.h @@ -161,7 +161,7 @@ typedef struct RailtypeInfo { byte compatible_railtypes; } RailtypeInfo; -RailtypeInfo railtypes[RAILTYPE_END]; +extern const RailtypeInfo _railtypes[RAILTYPE_END]; // these are the maximums used for updating signal blocks, and checking if a depot is in a pbs block enum { @@ -528,10 +528,10 @@ static inline TransportType GetCrossingTransportType(TileIndex tile, Track track * @param railtype the rail type which the information is requested for * @return The pointer to the RailtypeInfo */ -static inline RailtypeInfo *GetRailTypeInfo(RailType railtype) +static inline const RailtypeInfo *GetRailTypeInfo(RailType railtype) { assert(railtype < RAILTYPE_END); - return &railtypes[railtype]; + return &_railtypes[railtype]; } /** diff --git a/rail_cmd.c b/rail_cmd.c index ca854fa5e5..05367a8b29 100644 --- a/rail_cmd.c +++ b/rail_cmd.c @@ -22,6 +22,7 @@ #include "waypoint.h" #include "npf.h" #include "rail.h" +#include "railtypes.h" // include table for railtypes extern uint16 _custom_sprites_base; diff --git a/railtypes.c b/railtypes.h similarity index 86% rename from railtypes.c rename to railtypes.h index 9305a58eb6..d89832bc5e 100644 --- a/railtypes.c +++ b/railtypes.h @@ -1,17 +1,12 @@ /* $Id: */ -#include "stdafx.h" -#include "openttd.h" -#include "rail.h" -#include "table/sprites.h" - -/** @file railtypes.c +/** @file railtypes.h * All the railtype-specific information is stored here. */ /** Global Railtype definition */ -RailtypeInfo railtypes[RAILTYPE_END] = { +const RailtypeInfo _railtypes[RAILTYPE_END] = { { { SPR_RAIL_TRACK_Y,