Mercurial > hg > openttd
changeset 16001:3ea421d91675 draft
(svn r20689) -Codechange: Make some global functions used in 1 .cpp file static in that file.
| author | alberth <alberth@openttd.org> |
|---|---|
| date | Sun, 29 Aug 2010 15:58:43 +0000 |
| parents | 944256db9184 |
| children | b433062466f7 |
| files | src/company_cmd.cpp src/company_manager_face.h src/fileio.cpp src/fileio_func.h src/network/network_func.h src/network/network_server.cpp src/newgrf_canal.cpp src/newgrf_canal.h src/settings.cpp src/settings_func.h src/window.cpp src/window_gui.h |
| diffstat | 12 files changed, 6 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/company_cmd.cpp +++ b/src/company_cmd.cpp @@ -138,7 +138,7 @@ * @param cmf the fact to check * @return true if and only if the face is valid */ -bool IsValidCompanyManagerFace(CompanyManagerFace cmf) +static bool IsValidCompanyManagerFace(CompanyManagerFace cmf) { if (!AreCompanyManagerFaceBitsValid(cmf, CMFV_GEN_ETHN, GE_WM)) return false;
--- a/src/company_manager_face.h +++ b/src/company_manager_face.h @@ -237,6 +237,5 @@ } void DrawCompanyManagerFace(CompanyManagerFace face, int colour, int x, int y); -bool IsValidCompanyManagerFace(CompanyManagerFace cmf); #endif /* COMPANY_MANAGER_FACE_H */
--- a/src/fileio.cpp +++ b/src/fileio.cpp @@ -426,7 +426,7 @@ * Create a directory with the given name * @param name the new name of the directory */ -void FioCreateDirectory(const char *name) +static void FioCreateDirectory(const char *name) { #if defined(WIN32) || defined(WINCE) CreateDirectory(OTTD2FS(name), NULL);
--- a/src/fileio_func.h +++ b/src/fileio_func.h @@ -25,7 +25,6 @@ void FioOpenFile(int slot, const char *filename); void FioReadBlock(void *ptr, size_t size); void FioSkipBytes(int n); -void FioCreateDirectory(const char *filename); /** * The searchpaths OpenTTD could search through.
--- a/src/network/network_func.h +++ b/src/network/network_func.h @@ -72,7 +72,6 @@ void NetworkServerDoMove(ClientID client_id, CompanyID company_id); void NetworkServerSendRcon(ClientID client_id, ConsoleColour colour_code, const char *string); -void NetworkServerSendError(ClientID client_id, NetworkErrorCode error); void NetworkServerSendChat(NetworkAction action, DestType type, int dest, const char *msg, ClientID from_id, int64 data = 0); void NetworkServerKickClient(ClientID client_id);
--- a/src/network/network_server.cpp +++ b/src/network/network_server.cpp @@ -1776,7 +1776,7 @@ SEND_COMMAND(PACKET_SERVER_RCON)(NetworkFindClientStateFromClientID(client_id), colour_code, string); } -void NetworkServerSendError(ClientID client_id, NetworkErrorCode error) +static void NetworkServerSendError(ClientID client_id, NetworkErrorCode error) { SEND_COMMAND(PACKET_SERVER_ERROR)(NetworkFindClientStateFromClientID(client_id), error); }
--- a/src/newgrf_canal.cpp +++ b/src/newgrf_canal.cpp @@ -114,7 +114,7 @@ * @param tile Tile index of canal. * @return Callback result or CALLBACK_FAILED if the callback failed. */ -uint16 GetCanalCallback(CallbackID callback, uint32 param1, uint32 param2, CanalFeature feature, TileIndex tile) +static uint16 GetCanalCallback(CallbackID callback, uint32 param1, uint32 param2, CanalFeature feature, TileIndex tile) { ResolverObject object; const SpriteGroup *group;
--- a/src/newgrf_canal.h +++ b/src/newgrf_canal.h @@ -58,7 +58,6 @@ */ SpriteID GetCanalSprite(CanalFeature feature, TileIndex tile); -uint16 GetCanalCallback(CallbackID callback, uint32 param1, uint32 param2, CanalFeature feature, TileIndex tile); uint GetCanalSpriteOffset(CanalFeature feature, TileIndex tile, uint cur_offset); #endif /* NEWGRF_CANAL_H */
--- a/src/settings.cpp +++ b/src/settings.cpp @@ -161,7 +161,7 @@ * @param maxitems the maximum number of elements the integerlist-array has * @return returns the number of items found, or -1 on an error */ -int ParseIntList(const char *p, int *items, int maxitems) +static int ParseIntList(const char *p, int *items, int maxitems) { int n = 0; // number of items read so far bool comma = false; // do we accept comma?
--- a/src/settings_func.h +++ b/src/settings_func.h @@ -20,8 +20,6 @@ void IConsoleGetSetting(const char *name, bool force_newgame = false); void IConsoleListSettings(const char *prefilter); -int ParseIntList(const char *p, int *items, int maxitems); - void LoadFromConfig(); void SaveToConfig(); void CheckConfig();
--- a/src/window.cpp +++ b/src/window.cpp @@ -145,7 +145,7 @@ * has a edit box as focused widget, or if a console is focused. * @return returns true if an edit box is in global focus or if the focused window is a console, else false */ -bool EditBoxInGlobalFocus() +static bool EditBoxInGlobalFocus() { if (_focused_window == NULL) return false;