cpp/openttd-patchpack/source Changeset - r2236:150ecfd1ee92

Changeset - r2236:150ecfd1ee92

Parent rev.

Child rev.

[Not reviewed]

master

1 3 1

ludde - 19 years ago 2005-07-29 22:13:04
ludde@openttd.org

(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.

5 files changed with 60 insertions and 65 deletions:

Makefile

rail.h

rail_cmd.c

railtypes.c

railtypes.h

0 comments (0 inline, 0 general)

Makefile

➞

Show inline comments

@@ @@ -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

rail.h

➞

Show inline comments

@@ @@ -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 GetCrossingT @@
  * @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];
+}
 /**

rail_cmd.c

➞

Show inline comments

@@ @@ -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;

railtypes.c

➞

Show inline comments

deleted file

railtypes.h

➞

Show inline comments

@@ new file 100644 @@
 /* $Id: */
 /** @file railtypes.h
  * All the railtype-specific information is stored here.
  */
 /** Global Railtype definition
  */
 const RailtypeInfo _railtypes[RAILTYPE_END] = {
+	{
+		{
 			SPR_RAIL_TRACK_Y,
 			SPR_RAIL_TRACK_N_S,
 			SPR_RAIL_TRACK_BASE,
 			SPR_RAIL_SINGLE_Y,
 			SPR_RAIL_SINGLE_X,
 			SPR_RAIL_SINGLE_NORTH,
 			SPR_RAIL_SINGLE_SOUTH,
 			SPR_RAIL_SINGLE_EAST,
 			SPR_RAIL_SINGLE_WEST
 		},
 		SPR_RAIL_SNOW_OFFSET,
 		(1 << RAILTYPE_RAIL),
 	},
+	{
+		{
 			SPR_MONO_TRACK_Y,
 			SPR_MONO_TRACK_N_S,
 			SPR_MONO_TRACK_BASE,
 			SPR_MONO_SINGLE_Y,
 			SPR_MONO_SINGLE_X,
 			SPR_MONO_SINGLE_NORTH,
 			SPR_MONO_SINGLE_SOUTH,
 			SPR_MONO_SINGLE_EAST,
 			SPR_MONO_SINGLE_WEST
 		},
 		SPR_MONO_SNOW_OFFSET,
 		(1 << RAILTYPE_MONO),
 	},
+	{
+		{
 			SPR_MGLV_TRACK_Y,
 			SPR_MGLV_TRACK_N_S,
 			SPR_MGLV_TRACK_BASE,
 			SPR_MGLV_SINGLE_Y,
 			SPR_MGLV_SINGLE_X,
 			SPR_MGLV_SINGLE_NORTH,
 			SPR_MGLV_SINGLE_SOUTH,
 			SPR_MGLV_SINGLE_EAST,
 			SPR_MGLV_SINGLE_WEST
 		},
 		SPR_MGLV_SNOW_OFFSET,
 		(1 << RAILTYPE_MAGLEV),
 	},
 };

0 comments (0 inline, 0 general)