From c27f3cfa6239ff98f3b8dfe9a20b1177707a530f Mon Sep 17 00:00:00 2001 From: rubidium Date: Tue, 6 May 2008 22:17:12 +0000 Subject: (svn r12977) -Codechange: remove quite some redundant (duplicate) function declarations. --- config.lib | 2 +- src/economy.cpp | 1 + src/functions.h | 3 --- src/gfx_func.h | 5 ----- src/gui.h | 3 --- src/intro_gui.cpp | 1 + src/players.cpp | 2 -- src/smallmap_gui.cpp | 1 + src/statusbar_gui.cpp | 1 + src/stdafx.h | 4 ++-- src/train.h | 1 - src/vehicle_gui.cpp | 1 + src/video/sdl_v.cpp | 2 ++ src/video/win32_v.cpp | 2 ++ src/viewport.cpp | 1 + src/window.cpp | 1 + src/window_func.h | 1 - src/window_gui.h | 18 ------------------ 18 files changed, 14 insertions(+), 36 deletions(-) diff --git a/config.lib b/config.lib index 69385ca5b..e3a140456 100644 --- a/config.lib +++ b/config.lib @@ -921,7 +921,7 @@ make_cflags_and_ldflags() { if [ $cc_version -ge 29 ]; then CFLAGS="$CFLAGS -Wall -Wno-multichar -Wsign-compare -Wundef" CFLAGS="$CFLAGS -Wwrite-strings -Wpointer-arith" - CFLAGS="$CFLAGS -Wno-uninitialized" + CFLAGS="$CFLAGS -Wno-uninitialized -Wredundant-decls" CC_CFLAGS="$CC_CFLAGS -Wstrict-prototypes" fi diff --git a/src/economy.cpp b/src/economy.cpp index 5ff83ad07..908cde3fc 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -45,6 +45,7 @@ #include "signal_func.h" #include "gfx_func.h" #include "autoreplace_func.h" +#include "player_gui.h" #include "table/strings.h" #include "table/sprites.h" diff --git a/src/functions.h b/src/functions.h index 55dcddacb..e2fe87997 100644 --- a/src/functions.h +++ b/src/functions.h @@ -60,9 +60,6 @@ void RedrawAutosave(); void UpdateViewportSignPos(ViewportSign *sign, int left, int top, StringID str); -/* callback from drivers that is called if the game size changes dynamically */ -void GameSizeChanged(); - int ttd_main(int argc, char* argv[]); void HandleExitGameRequest(); diff --git a/src/gfx_func.h b/src/gfx_func.h index 2ca83087e..61bdac627 100644 --- a/src/gfx_func.h +++ b/src/gfx_func.h @@ -70,10 +70,8 @@ void HandleMouseEvents(); void CSleep(int milliseconds); void UpdateWindows(); -void DrawChatMessage(); void DrawMouseCursor(); void ScreenSizeChanged(); -void HandleExitGameRequest(); void GameSizeChanged(); void UndrawMouseCursor(); @@ -142,9 +140,6 @@ void DrawOverlappedWindowForAll(int left, int top, int right, int bottom); void SetMouseCursor(SpriteID sprite, SpriteID pal); void SetAnimatedMouseCursor(const AnimCursor *table); void CursorTick(); -void DrawMouseCursor(); -void ScreenSizeChanged(); -void UndrawMouseCursor(); bool ChangeResInGame(int w, int h); void SortResolutions(int count); bool ToggleFullScreen(bool fs); diff --git a/src/gui.h b/src/gui.h index e82f34add..fcaad3d3c 100644 --- a/src/gui.h +++ b/src/gui.h @@ -76,9 +76,6 @@ enum { DDSP_PLACE_AUTOROAD, }; -/* timetable_gui.cpp */ -void ShowTimetableWindow(const Vehicle *v); - /* misc_gui.cpp */ void PlaceLandBlockInfo(); void ShowAboutWindow(); diff --git a/src/intro_gui.cpp b/src/intro_gui.cpp index 1acdfff6e..4e702f937 100644 --- a/src/intro_gui.cpp +++ b/src/intro_gui.cpp @@ -18,6 +18,7 @@ #include "fios.h" #include "gfx_func.h" #include "settings_type.h" +#include "functions.h" #include "table/strings.h" #include "table/sprites.h" diff --git a/src/players.cpp b/src/players.cpp index d72bc2b95..4a297936c 100644 --- a/src/players.cpp +++ b/src/players.cpp @@ -614,8 +614,6 @@ void OnTick_Players() MaybeStartNewPlayer(); } -extern void ShowPlayerFinances(PlayerID player); - void PlayersYearlyLoop() { Player *p; diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp index 35e5a7b4f..17f690b54 100644 --- a/src/smallmap_gui.cpp +++ b/src/smallmap_gui.cpp @@ -27,6 +27,7 @@ #include "vehicle_base.h" #include "sound_func.h" #include "settings_type.h" +#include "window_func.h" #include "table/strings.h" #include "table/sprites.h" diff --git a/src/statusbar_gui.cpp b/src/statusbar_gui.cpp index 17bc3a75a..0b145c8a2 100644 --- a/src/statusbar_gui.cpp +++ b/src/statusbar_gui.cpp @@ -17,6 +17,7 @@ #include "player_gui.h" #include "window_gui.h" #include "variables.h" +#include "window_func.h" #include "table/strings.h" #include "table/sprites.h" diff --git a/src/stdafx.h b/src/stdafx.h index 43a1694fb..80c60f1c9 100644 --- a/src/stdafx.h +++ b/src/stdafx.h @@ -283,7 +283,7 @@ typedef unsigned char byte; #if defined(__OS2__) #define assert_compile(expr) #else - #define assert_compile(expr) extern "C" void __ct_assert__(int a[1 - 2 * !(expr)]) + #define assert_compile(expr) extern const int __ct_assert__[1 - 2 * !(expr)] #endif /* __OS2__ */ /* Check if the types have the bitsizes like we are using them */ @@ -292,7 +292,7 @@ assert_compile(sizeof(uint32) == 4); assert_compile(sizeof(uint16) == 2); assert_compile(sizeof(uint8) == 1); -#define lengthof(x) (sizeof(x)/sizeof(x[0])) +#define lengthof(x) (sizeof(x) / sizeof(x[0])) #define endof(x) (&x[lengthof(x)]) #define lastof(x) (&x[lengthof(x) - 1]) diff --git a/src/train.h b/src/train.h index c78ab6167..af7bb94e7 100644 --- a/src/train.h +++ b/src/train.h @@ -264,7 +264,6 @@ void ConvertOldMultiheadToNew(); void ConnectMultiheadedTrains(); uint CountArticulatedParts(EngineID engine_type); -int CheckTrainInDepot(const Vehicle *v, bool needs_to_be_stopped); void CcBuildLoco(bool success, TileIndex tile, uint32 p1, uint32 p2); void CcBuildWagon(bool success, TileIndex tile, uint32 p1, uint32 p2); diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index 5ec4fa2fb..13156b350 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -35,6 +35,7 @@ #include "settings_type.h" #include "widgets/dropdown_func.h" #include "order_func.h" +#include "timetable.h" #include "table/sprites.h" #include "table/strings.h" diff --git a/src/video/sdl_v.cpp b/src/video/sdl_v.cpp index a9a13411c..9872c14cf 100644 --- a/src/video/sdl_v.cpp +++ b/src/video/sdl_v.cpp @@ -15,6 +15,8 @@ #include "../network/network.h" #include "../core/math_func.hpp" #include "../core/random_func.hpp" +#include "../functions.h" +#include "../texteff.hpp" #include "sdl_v.h" #include diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp index 35d698455..f553b9916 100644 --- a/src/video/win32_v.cpp +++ b/src/video/win32_v.cpp @@ -12,6 +12,8 @@ #include "../network/network.h" #include "../core/math_func.hpp" #include "../core/random_func.hpp" +#include "../functions.h" +#include "../texteff.hpp" #include "win32_v.h" #include #include diff --git a/src/viewport.cpp b/src/viewport.cpp index a741a83a7..d70a0ed5d 100644 --- a/src/viewport.cpp +++ b/src/viewport.cpp @@ -45,6 +45,7 @@ #include "station_func.h" #include "core/alloc_type.hpp" #include "misc/smallvec.h" +#include "window_func.h" #include "table/sprites.h" #include "table/strings.h" diff --git a/src/window.cpp b/src/window.cpp index f9c45fa63..346af1b9f 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -20,6 +20,7 @@ #include "vehicle_base.h" #include "settings_type.h" #include "cheat_func.h" +#include "window_func.h" #include "table/sprites.h" diff --git a/src/window_func.h b/src/window_func.h index 851d207ce..54a7856d8 100644 --- a/src/window_func.h +++ b/src/window_func.h @@ -25,7 +25,6 @@ void SetupColorsAndInitialWindow(); void InputLoop(); void InvalidateThisWindowData(Window *w); void InvalidateWindowData(WindowClass cls, WindowNumber number); -void RelocateAllWindows(int neww, int newh); void DeleteNonVitalWindows(); void DeleteAllNonVitalWindows(); diff --git a/src/window_gui.h b/src/window_gui.h index ae6edabec..a608957ee 100644 --- a/src/window_gui.h +++ b/src/window_gui.h @@ -546,13 +546,6 @@ enum WindowFlags { void CallWindowEventNP(Window *w, int event); void CallWindowTickEvent(); -void SetWindowDirty(const Window *w); -void SendWindowMessage(WindowClass wnd_class, WindowNumber wnd_num, int msg, int wparam, int lparam); -void SendWindowMessageClass(WindowClass wnd_class, int msg, int wparam, int lparam); - -Window *FindWindowById(WindowClass cls, WindowNumber number); -void DeletePlayerWindows(PlayerID pi); -void ChangeWindowOwner(PlayerID old_player, PlayerID new_player); Window *BringWindowToFrontById(WindowClass cls, WindowNumber number); Window *FindWindowFromPt(int x, int y); @@ -566,15 +559,8 @@ Window *AllocateWindowDesc(const WindowDesc *desc, void *data = NULL); Window *AllocateWindowDescFront(const WindowDesc *desc, int window_number, void *data = NULL); void DrawWindowViewport(const Window *w); -void ResizeWindow(Window *w, int x, int y); -void InitWindowSystem(); -void UnInitWindowSystem(); -void ResetWindowSystem(); int GetMenuItemIndex(const Window *w, int x, int y); -void InputLoop(); -void InvalidateThisWindowData(Window *w); -void InvalidateWindowData(WindowClass cls, WindowNumber number); void RelocateAllWindows(int neww, int newh); /* misc_gui.cpp */ @@ -622,10 +608,6 @@ enum SpecialMouseMode { }; Window *GetCallbackWnd(); -void DeleteNonVitalWindows(); -void DeleteAllNonVitalWindows(); -void HideVitalWindows(); -void ShowVitalWindows(); Window **FindWindowZPosition(const Window *w); void ScrollbarClickHandler(Window *w, const Widget *wi, int x, int y); -- cgit v1.2.3-54-g00ecf