summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-05-07 13:18:33 +0000
committerrubidium <rubidium@openttd.org>2008-05-07 13:18:33 +0000
commitcd7c99452f0fe99f0ad8ae6826c6e9892b137690 (patch)
tree5380a74fbff0d7fcd5e9b99de0df0aa6e71d2d04 /src
parent0cfd2baa3c5d5f5e283bfde3e7b7dd8ec3f0d2f8 (diff)
downloadopenttd-cd7c99452f0fe99f0ad8ae6826c6e9892b137690.tar.xz
(svn r12989) -Codechange: move ViewportSign to viewport_type.h.
Diffstat (limited to 'src')
-rw-r--r--src/functions.h2
-rw-r--r--src/openttd.h6
-rw-r--r--src/signs_base.h1
-rw-r--r--src/viewport_type.h6
-rw-r--r--src/waypoint.cpp1
-rw-r--r--src/waypoint.h1
6 files changed, 9 insertions, 8 deletions
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)