Changeset - r15991:9b390068ea00
[Not reviewed]
master
0 12 0
alberth - 14 years ago 2010-08-29 15:58:43
alberth@openttd.org
(svn r20689) -Codechange: Make some global functions used in 1 .cpp file static in that file.
12 files changed with 6 insertions and 13 deletions:
0 comments (0 inline, 0 general)
src/company_cmd.cpp
Show inline comments
 
@@ -138,7 +138,7 @@ void DrawCompanyIcon(CompanyID c, int x,
 
 * @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;
 

	
src/company_manager_face.h
Show inline comments
 
@@ -237,6 +237,5 @@ static inline SpriteID GetCompanyManager
 
}
 

	
 
void DrawCompanyManagerFace(CompanyManagerFace face, int colour, int x, int y);
 
bool IsValidCompanyManagerFace(CompanyManagerFace cmf);
 

	
 
#endif /* COMPANY_MANAGER_FACE_H */
src/fileio.cpp
Show inline comments
 
@@ -426,7 +426,7 @@ FILE *FioFOpenFile(const char *filename,
 
 * 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);
src/fileio_func.h
Show inline comments
 
@@ -25,7 +25,6 @@ void FioCloseAll();
 
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.
src/network/network_func.h
Show inline comments
 
@@ -72,7 +72,6 @@ const char *GetClientIP(NetworkClientInf
 

	
 
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);
src/network/network_server.cpp
Show inline comments
 
@@ -1776,7 +1776,7 @@ void NetworkServerSendRcon(ClientID clie
 
	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);
 
}
src/newgrf_canal.cpp
Show inline comments
 
@@ -114,7 +114,7 @@ SpriteID GetCanalSprite(CanalFeature fea
 
 * @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;
src/newgrf_canal.h
Show inline comments
 
@@ -58,7 +58,6 @@ extern WaterFeature _water_feature[CF_EN
 
 */
 
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 */
src/settings.cpp
Show inline comments
 
@@ -161,7 +161,7 @@ static uint32 LookupManyOfMany(const cha
 
 * @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?
src/settings_func.h
Show inline comments
 
@@ -20,8 +20,6 @@ void IConsoleSetSetting(const char *name
 
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();
src/window.cpp
Show inline comments
 
@@ -145,7 +145,7 @@ void SetFocusedWindow(Window *w)
 
 * 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;
 

	
src/window_gui.h
Show inline comments
 
@@ -815,7 +815,6 @@ extern SpecialMouseMode _special_mouse_m
 
Window *GetCallbackWnd();
 

	
 
void SetFocusedWindow(Window *w);
 
bool EditBoxInGlobalFocus();
 

	
 
void ScrollbarClickHandler(Window *w, NWidgetCore *nw, int x, int y);
 

	
0 comments (0 inline, 0 general)