mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r1508) Remove duplicate declarations and include proper headers where necessary
This commit is contained in:
parent
9d1f7e7348
commit
4136f395bf
1
engine.c
1
engine.c
|
@ -3,6 +3,7 @@
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "engine.h"
|
#include "engine.h"
|
||||||
#include "table/engines.h"
|
#include "table/engines.h"
|
||||||
|
#include "gfx.h"
|
||||||
#include "player.h"
|
#include "player.h"
|
||||||
#include "command.h"
|
#include "command.h"
|
||||||
#include "vehicle.h"
|
#include "vehicle.h"
|
||||||
|
|
|
@ -9,9 +9,6 @@
|
||||||
#include "command.h"
|
#include "command.h"
|
||||||
#include "news.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)
|
StringID GetEngineCategoryName(byte engine)
|
||||||
{
|
{
|
||||||
|
|
|
@ -218,7 +218,6 @@ bool EnsureNoVehicle(TileIndex tile);
|
||||||
bool EnsureNoVehicleZ(TileIndex tile, byte z);
|
bool EnsureNoVehicleZ(TileIndex tile, byte z);
|
||||||
void MarkAllViewportsDirty(int left, int top, int right, int bottom);
|
void MarkAllViewportsDirty(int left, int top, int right, int bottom);
|
||||||
void ShowCostOrIncomeAnimation(int x, int y, int z, int32 cost);
|
void ShowCostOrIncomeAnimation(int x, int y, int z, int32 cost);
|
||||||
void MarkWholeScreenDirty();
|
|
||||||
|
|
||||||
void DrawFoundation(TileInfo *ti, uint f);
|
void DrawFoundation(TileInfo *ti, uint f);
|
||||||
|
|
||||||
|
@ -228,7 +227,6 @@ void ChangeTownRating(Town *t, int add, int max);
|
||||||
|
|
||||||
uint GetRoadBitsByTile(TileIndex tile);
|
uint GetRoadBitsByTile(TileIndex tile);
|
||||||
int GetTownRadiusGroup(Town *t, uint 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 ShowNetworkChatQueryWindow(byte desttype, byte dest);
|
||||||
void ShowNetworkGiveMoneyWindow(byte player);
|
void ShowNetworkGiveMoneyWindow(byte player);
|
||||||
void ShowNetworkNeedGamePassword();
|
void ShowNetworkNeedGamePassword();
|
||||||
|
|
1
gfx.c
1
gfx.c
|
@ -5,7 +5,6 @@
|
||||||
#include "hal.h"
|
#include "hal.h"
|
||||||
|
|
||||||
static void GfxMainBlitter(byte *sprite, int x, int y, int mode);
|
static void GfxMainBlitter(byte *sprite, int x, int y, int mode);
|
||||||
void GfxInitPalettes();
|
|
||||||
|
|
||||||
static int _stringwidth_out;
|
static int _stringwidth_out;
|
||||||
static byte _cursor_backup[64*64];
|
static byte _cursor_backup[64*64];
|
||||||
|
|
1
misc.c
1
misc.c
|
@ -176,7 +176,6 @@ void GenerateUnmovables();
|
||||||
void GenerateTowns();
|
void GenerateTowns();
|
||||||
|
|
||||||
void StartupPlayers();
|
void StartupPlayers();
|
||||||
void StartupEngines();
|
|
||||||
void StartupDisasters();
|
void StartupDisasters();
|
||||||
void GenerateTrees();
|
void GenerateTrees();
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,6 @@
|
||||||
#include "hal.h" // for file list
|
#include "hal.h" // for file list
|
||||||
|
|
||||||
bool _query_string_active;
|
bool _query_string_active;
|
||||||
void SetFiosType(const byte fiostype);
|
|
||||||
|
|
||||||
/* Now this is what I call dirty.. the edit-box needs to be rewritten! */
|
/* 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;
|
static bool _do_edit_on_text_even_when_no_change_to_edit_box;
|
||||||
|
|
|
@ -1439,8 +1439,6 @@ static const WindowDesc _chat_window_desc = {
|
||||||
ChatWindowWndProc
|
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)
|
void ShowChatWindow(StringID str, StringID caption, int maxlen, int maxwidth, byte window_class, uint16 window_number)
|
||||||
{
|
{
|
||||||
Window *w;
|
Window *w;
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
#include "stdafx.h"
|
#include "stdafx.h"
|
||||||
#include "ttd.h"
|
#include "ttd.h"
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
|
#include "gfx.h"
|
||||||
#include "map.h"
|
#include "map.h"
|
||||||
#include "vehicle.h"
|
#include "vehicle.h"
|
||||||
#include "viewport.h"
|
#include "viewport.h"
|
||||||
|
|
2
ttd.c
2
ttd.c
|
@ -30,8 +30,6 @@
|
||||||
|
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
||||||
void GameLoop();
|
|
||||||
|
|
||||||
void IncreaseSpriteLRU();
|
void IncreaseSpriteLRU();
|
||||||
void GenerateWorld(int mode);
|
void GenerateWorld(int mode);
|
||||||
void CallLandscapeTick();
|
void CallLandscapeTick();
|
||||||
|
|
2
window.h
2
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 DrawOverlappedWindow(Window *w, int left, int top, int right, int bottom);
|
||||||
void CallWindowEventNP(Window *w, int event);
|
void CallWindowEventNP(Window *w, int event);
|
||||||
void CallWindowTickEvent();
|
void CallWindowTickEvent();
|
||||||
void DrawDirtyBlocks();
|
|
||||||
void SetDirtyBlocks(int left, int top, int right, int bottom);
|
|
||||||
void SetWindowDirty(Window *w);
|
void SetWindowDirty(Window *w);
|
||||||
|
|
||||||
Window *FindWindowById(WindowClass cls, WindowNumber number);
|
Window *FindWindowById(WindowClass cls, WindowNumber number);
|
||||||
|
|
Loading…
Reference in New Issue