diff options
| -rw-r--r-- | projects/openttd_vs80.vcproj | 8 | ||||
| -rw-r--r-- | projects/openttd_vs90.vcproj | 8 | ||||
| -rw-r--r-- | source.list | 2 | ||||
| -rw-r--r-- | src/functions.h | 2 | ||||
| -rw-r--r-- | src/openttd.h | 6 | ||||
| -rw-r--r-- | src/signs_base.h | 1 | ||||
| -rw-r--r-- | src/viewport_type.h | 6 | ||||
| -rw-r--r-- | src/waypoint.cpp | 1 | ||||
| -rw-r--r-- | src/waypoint.h | 1 |
9 files changed, 27 insertions, 8 deletions
diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj index 35e17291d..39fdbba28 100644 --- a/projects/openttd_vs80.vcproj +++ b/projects/openttd_vs80.vcproj @@ -1496,6 +1496,14 @@ > </File> <File + RelativePath=".\..\src\tilehighlight_func.h" + > + </File> + <File + RelativePath=".\..\src\tilehighlight_type.h" + > + </File> + <File RelativePath=".\..\src\timetable.h" > </File> diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj index 42a2292f5..dca3e8d43 100644 --- a/projects/openttd_vs90.vcproj +++ b/projects/openttd_vs90.vcproj @@ -1493,6 +1493,14 @@ > </File> <File + RelativePath=".\..\src\tilehighlight_func.h" + > + </File> + <File + RelativePath=".\..\src\tilehighlight_type.h" + > + </File> + <File RelativePath=".\..\src\timetable.h" > </File> diff --git a/source.list b/source.list index 79d112e44..f4f263276 100644 --- a/source.list +++ b/source.list @@ -299,6 +299,8 @@ tgp.h thread.h tile_cmd.h tile_type.h +tilehighlight_func.h +tilehighlight_type.h timetable.h town.h town_type.h diff --git a/src/functions.h b/src/functions.h index e2fe87997..e0d5ee390 100644 --- a/src/functions.h +++ b/src/functions.h @@ -58,8 +58,6 @@ void AskExitToGameMenu(); void RedrawAutosave(); -void UpdateViewportSignPos(ViewportSign *sign, int left, int top, StringID str); - int ttd_main(int argc, char* argv[]); void HandleExitGameRequest(); diff --git a/src/openttd.h b/src/openttd.h index de17ccd5d..1f3468159 100644 --- a/src/openttd.h +++ b/src/openttd.h @@ -54,12 +54,6 @@ enum { DO_WAYPOINTS = 6, }; -struct ViewportSign { - int32 left; - int32 top; - byte width_1, width_2; -}; - enum { SORT_ASCENDING = 0, SORT_DESCENDING = 1, diff --git a/src/signs_base.h b/src/signs_base.h index 3fd945b5a..e27441cb4 100644 --- a/src/signs_base.h +++ b/src/signs_base.h @@ -6,6 +6,7 @@ #define SIGNS_BASE_H #include "signs_type.h" +#include "viewport_type.h" #include "oldpool.h" DECLARE_OLD_POOL(Sign, Sign, 2, 16000) diff --git a/src/viewport_type.h b/src/viewport_type.h index e14862e65..166ca6593 100644 --- a/src/viewport_type.h +++ b/src/viewport_type.h @@ -24,6 +24,12 @@ struct ViewPort { ZoomLevel zoom; }; +struct ViewportSign { + int32 left; + int32 top; + byte width_1, width_2; +}; + enum { ZOOM_IN = 0, ZOOM_OUT = 1, diff --git a/src/waypoint.cpp b/src/waypoint.cpp index 99e099c07..8cf8880c1 100644 --- a/src/waypoint.cpp +++ b/src/waypoint.cpp @@ -32,6 +32,7 @@ #include "settings_type.h" #include "newgrf_station.h" #include "oldpool_func.h" +#include "viewport_func.h" #include "table/strings.h" diff --git a/src/waypoint.h b/src/waypoint.h index a6ba958ae..36014f7ca 100644 --- a/src/waypoint.h +++ b/src/waypoint.h @@ -11,6 +11,7 @@ #include "command_type.h" #include "station_type.h" #include "town_type.h" +#include "viewport_type.h" DECLARE_OLD_POOL(Waypoint, Waypoint, 3, 8000) |