diff options
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | newgrf_station.c (renamed from station_newgrf.c) | 4 | ||||
-rw-r--r-- | newgrf_station.h (renamed from station_newgrf.h) | 8 | ||||
-rw-r--r-- | openttd.dsp | 16 | ||||
-rw-r--r-- | openttd.vcproj | 12 | ||||
-rw-r--r-- | station.h | 2 |
6 files changed, 22 insertions, 22 deletions
@@ -654,6 +654,7 @@ SRCS += network_server.c SRCS += network_udp.c SRCS += newgrf.c SRCS += newgrf_engine.c +SRCS += newgrf_station.c SRCS += news_gui.c SRCS += npf.c SRCS += oldloader.c @@ -686,7 +687,6 @@ SRCS += sprite.c SRCS += spritecache.c SRCS += station_cmd.c SRCS += station_gui.c -SRCS += station_newgrf.c SRCS += string.c SRCS += strings.c SRCS += subsidy_gui.c diff --git a/station_newgrf.c b/newgrf_station.c index 1150a2376..81ce3249a 100644 --- a/station_newgrf.c +++ b/newgrf_station.c @@ -1,12 +1,12 @@ /* $Id$ */ -/** @file station_newgrf.c Functions for dealing with station classes and custom stations. */ +/** @file newgrf_station.c Functions for dealing with station classes and custom stations. */ #include "stdafx.h" #include "openttd.h" #include "debug.h" #include "sprite.h" -#include "station_newgrf.h" +#include "newgrf_station.h" static StationClass station_classes[STAT_CLASS_MAX]; diff --git a/station_newgrf.h b/newgrf_station.h index b4bca4b46..60033de77 100644 --- a/station_newgrf.h +++ b/newgrf_station.h @@ -1,9 +1,9 @@ /* $Id$ */ -/** @file station_newgrf.h Header file for NewGRF stations */ +/** @file newgrf_station.h Header file for NewGRF stations */ -#ifndef STATION_NEWGRF_H -#define STATION_NEWGRF_H +#ifndef NEWGRF_STATION_H +#define NEWGRF_STATION_H #include "engine.h" @@ -74,4 +74,4 @@ uint GetNumCustomStations(StationClassID sclass); void SetCustomStation(StationSpec *spec); const StationSpec *GetCustomStation(StationClassID sclass, uint station); -#endif /* STATION_NEWGRF_H */ +#endif /* NEWGRF_STATION_H */ diff --git a/openttd.dsp b/openttd.dsp index 4c0f9aebe..f9d4f677d 100644 --- a/openttd.dsp +++ b/openttd.dsp @@ -280,6 +280,10 @@ SOURCE=.\newgrf_engine.c # End Source File # Begin Source File +SOURCE=.\newgrf_station.c +# End Source File +# Begin Source File + SOURCE=.\npf.c # End Source File # Begin Source File @@ -413,10 +417,6 @@ SOURCE=.\spritecache.c # End Source File # Begin Source File -SOURCE=.\station_newgrf.c -# End Source File -# Begin Source File - SOURCE=.\StdAfx.c !IF "$(CFG)" == "openttd - Win32 Release" @@ -630,6 +630,10 @@ SOURCE=.\newgrf_engine.h # End Source File # Begin Source File +SOURCE=.\newgrf_station.h +# End Source File +# Begin Source File + SOURCE=.\news.h # End Source File # Begin Source File @@ -698,10 +702,6 @@ SOURCE=.\station.h # End Source File # Begin Source File -SOURCE=.\station_newgrf.h -# End Source File -# Begin Source File - SOURCE=.\StdAfx.h # End Source File # Begin Source File diff --git a/openttd.vcproj b/openttd.vcproj index 35fffbd73..133a050b8 100644 --- a/openttd.vcproj +++ b/openttd.vcproj @@ -276,6 +276,9 @@ RelativePath=".\newgrf_engine.c"> </File> <File + RelativePath=".\newgrf_station.c"> + </File> + <File RelativePath=".\npf.c"> </File> <File @@ -342,9 +345,6 @@ RelativePath=".\spritecache.c"> </File> <File - RelativePath=".\station_newgrf.c"> - </File> - <File RelativePath=".\StdAfx.c"> </File> <File @@ -493,6 +493,9 @@ RelativePath=".\newgrf_engine.h"> </File> <File + RelativePath=".\newgrf_station.h"> + </File> + <File RelativePath=".\news.h"> </File> <File @@ -553,9 +556,6 @@ RelativePath=".\station.h"> </File> <File - RelativePath=".\station_newgrf.h"> - </File> - <File RelativePath=".\StdAfx.h"> </File> <File @@ -8,7 +8,7 @@ #include "sprite.h" #include "tile.h" #include "vehicle.h" -#include "station_newgrf.h" +#include "newgrf_station.h" typedef struct GoodsEntry { uint16 waiting_acceptance; |