# HG changeset patch # User tron # Date 2005-01-14 19:41:24 # Node ID 24bbc79858a21b61f1b4ae836cac12c84494a569 # Parent 89cd5a5ec7a5f8f0c1f62b3530511e93eea90393 (svn r1508) Remove duplicate declarations and include proper headers where necessary diff --git a/engine.c b/engine.c --- 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 --- 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 --- 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, 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 --- 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 --- 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 --- 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 --- a/network_gui.c +++ b/network_gui.c @@ -1439,8 +1439,6 @@ static const WindowDesc _chat_window_des 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 --- 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 --- a/ttd.c +++ b/ttd.c @@ -30,8 +30,6 @@ #include -void GameLoop(); - void IncreaseSpriteLRU(); void GenerateWorld(int mode); void CallLandscapeTick(); diff --git a/window.h b/window.h --- a/window.h +++ b/window.h @@ -511,8 +511,6 @@ void DispatchMouseWheelEvent(Window *w, 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);