(svn r1508) Remove duplicate declarations and include proper headers where necessary

10 files changed, 2 insertions, 14 deletions

diff --git a/engine.c b/engine.c
index 652aa7a78..4f20a9e14 100644
--- a/engine.c
+++ b/engine.c
@@ -3,6 +3,7 @@
 #include "table/strings.h"
 #include "engine.h"
 #include "table/engines.h"
+#include "gfx.h"
 #include "player.h"
 #include "command.h"
 #include "vehicle.h"
diff --git a/engine_gui.c b/engine_gui.c
index e5aa8a7eb..9ad7718ff 100644
--- a/engine_gui.c
+++ b/engine_gui.c
@@ -9,9 +9,6 @@
 #include "command.h"
 #include "news.h"
 
-void DrawShipEngine(int x, int y, int engine, uint32 image_ormod);
-void DrawShipEngineInfo(int engine, int x, int y, int maxw);
-
 
 StringID GetEngineCategoryName(byte engine)
 {
diff --git a/functions.h b/functions.h
index b3e99906f..886010b50 100644
--- a/functions.h
+++ b/functions.h
@@ -218,7 +218,6 @@ bool EnsureNoVehicle(TileIndex tile);
 bool EnsureNoVehicleZ(TileIndex tile, byte z);
 void MarkAllViewportsDirty(int left, int top, int right, int bottom);
 void ShowCostOrIncomeAnimation(int x, int y, int z, int32 cost);
-void MarkWholeScreenDirty();
 
 void DrawFoundation(TileInfo *ti, uint f);
 
@@ -228,7 +227,6 @@ void ChangeTownRating(Town *t, int add, int max);
 
 uint GetRoadBitsByTile(TileIndex tile);
 int GetTownRadiusGroup(Town *t, uint tile);
-int32 GetTransportedGoodsIncome(uint num_pieces, uint dist, byte transit_days, byte cargo_type);
 void ShowNetworkChatQueryWindow(byte desttype, byte dest);
 void ShowNetworkGiveMoneyWindow(byte player);
 void ShowNetworkNeedGamePassword();
diff --git a/gfx.c b/gfx.c
index 24beee010..28e90792a 100644
--- a/gfx.c
+++ b/gfx.c
@@ -5,7 +5,6 @@
 #include "hal.h"
 
 static void GfxMainBlitter(byte *sprite, int x, int y, int mode);
-void GfxInitPalettes();
 
 static int _stringwidth_out;
 static byte _cursor_backup[64*64];
diff --git a/misc.c b/misc.c
index a0f5165f4..da2ad80ee 100644
--- a/misc.c
+++ b/misc.c
@@ -176,7 +176,6 @@ void GenerateUnmovables();
 void GenerateTowns();
 
 void StartupPlayers();
-void StartupEngines();
 void StartupDisasters();
 void GenerateTrees();
 
diff --git a/misc_gui.c b/misc_gui.c
index 804b5eaba..9f0499f32 100644
--- a/misc_gui.c
+++ b/misc_gui.c
@@ -16,7 +16,6 @@
 #include "hal.h" // for file list
 
 bool _query_string_active;
-void SetFiosType(const byte fiostype);
 
 /* Now this is what I call dirty.. the edit-box needs to be rewritten! */
 static bool _do_edit_on_text_even_when_no_change_to_edit_box;
diff --git a/network_gui.c b/network_gui.c
index fabb9f733..d59917f5c 100644
--- a/network_gui.c
+++ b/network_gui.c
@@ -1439,8 +1439,6 @@ static const WindowDesc _chat_window_desc = {
 	ChatWindowWndProc
 };
 
-static byte _edit_str_buf[MAX_QUERYSTR_LEN*2];
-
 void ShowChatWindow(StringID str, StringID caption, int maxlen, int maxwidth, byte window_class, uint16 window_number)
 {
 	Window *w;
diff --git a/rail_cmd.c b/rail_cmd.c
index cab96d87e..d75404e69 100644
--- a/rail_cmd.c
+++ b/rail_cmd.c
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "gfx.h"
 #include "map.h"
 #include "vehicle.h"
 #include "viewport.h"
diff --git a/ttd.c b/ttd.c
index 6bae4e950..d71f8c9ef 100644
--- a/ttd.c
+++ b/ttd.c
@@ -30,8 +30,6 @@
 
 #include <stdarg.h>
 
-void GameLoop();
-
 void IncreaseSpriteLRU();
 void GenerateWorld(int mode);
 void CallLandscapeTick();
diff --git a/window.h b/window.h
index 89ae45c97..d3e07a0cf 100644
--- a/window.h
+++ b/window.h
@@ -511,8 +511,6 @@ void DispatchMouseWheelEvent(Window *w, uint widget, int wheel);
 void DrawOverlappedWindow(Window *w, int left, int top, int right, int bottom);
 void CallWindowEventNP(Window *w, int event);
 void CallWindowTickEvent();
-void DrawDirtyBlocks();
-void SetDirtyBlocks(int left, int top, int right, int bottom);
 void SetWindowDirty(Window *w);
 
 Window *FindWindowById(WindowClass cls, WindowNumber number);