diff options
-rw-r--r-- | src/group.h | 2 | ||||
-rw-r--r-- | src/group_cmd.cpp | 2 | ||||
-rw-r--r-- | src/industry_cmd.cpp | 2 | ||||
-rw-r--r-- | src/landscape.cpp | 10 | ||||
-rw-r--r-- | src/landscape.h | 10 | ||||
-rw-r--r-- | src/saveload/group_sl.cpp | 4 | ||||
-rw-r--r-- | src/thread_morphos.cpp | 2 | ||||
-rw-r--r-- | src/transparency_gui.cpp | 2 |
8 files changed, 17 insertions, 17 deletions
diff --git a/src/group.h b/src/group.h index b09da0a17..364514f56 100644 --- a/src/group.h +++ b/src/group.h @@ -51,7 +51,7 @@ static inline bool IsAllGroupID(GroupID id_g) /** * Get the current size of the GroupPool */ -static inline uint GetGroupArraySize(void) +static inline uint GetGroupArraySize() { const Group *g; uint num = 0; diff --git a/src/group_cmd.cpp b/src/group_cmd.cpp index 2b56667f8..030bf6918 100644 --- a/src/group_cmd.cpp +++ b/src/group_cmd.cpp @@ -62,7 +62,7 @@ bool Group::IsValid() const return this->owner != INVALID_OWNER; } -void InitializeGroup(void) +void InitializeGroup() { _Group_pool.CleanPool(); _Group_pool.AddBlockToPool(); diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp index 6d8435005..23ff10046 100644 --- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -1846,7 +1846,7 @@ struct ProbabilityHelper { /** * Try to create a random industry, during gameplay */ -static void MaybeNewIndustry(void) +static void MaybeNewIndustry() { Industry *ind; // will receive the industry's creation pointer IndustryType rndtype, j; // Loop controlers diff --git a/src/landscape.cpp b/src/landscape.cpp index e599203c5..91372f456 100644 --- a/src/landscape.cpp +++ b/src/landscape.cpp @@ -526,7 +526,7 @@ void GetTileDesc(TileIndex tile, TileDesc *td) * @return true if the table has been loaded already. * @ingroup SnowLineGroup */ -bool IsSnowLineSet(void) +bool IsSnowLineSet() { return _snow_line != NULL; } @@ -555,7 +555,7 @@ void SetSnowLine(byte table[SNOW_LINE_MONTHS][SNOW_LINE_DAYS]) * @return the snow line height. * @ingroup SnowLineGroup */ -byte GetSnowLine(void) +byte GetSnowLine() { if (_snow_line == NULL) return _settings_game.game_creation.snow_line; @@ -569,7 +569,7 @@ byte GetSnowLine(void) * @return the highest snow line height. * @ingroup SnowLineGroup */ -byte HighestSnowLine(void) +byte HighestSnowLine() { return _snow_line == NULL ? _settings_game.game_creation.snow_line : _snow_line->highest_value; } @@ -579,7 +579,7 @@ byte HighestSnowLine(void) * @return the lowest snow line height. * @ingroup SnowLineGroup */ -byte LowestSnowLine(void) +byte LowestSnowLine() { return _snow_line == NULL ? _settings_game.game_creation.snow_line : _snow_line->lowest_value; } @@ -588,7 +588,7 @@ byte LowestSnowLine(void) * Clear the variable snow line table and free the memory. * @ingroup SnowLineGroup */ -void ClearSnowLine(void) +void ClearSnowLine() { free(_snow_line); _snow_line = NULL; diff --git a/src/landscape.h b/src/landscape.h index 4eae6394e..26355e423 100644 --- a/src/landscape.h +++ b/src/landscape.h @@ -23,12 +23,12 @@ struct SnowLine { byte lowest_value; ///< Lowest snow line of the year }; -bool IsSnowLineSet(void); +bool IsSnowLineSet(); void SetSnowLine(byte table[SNOW_LINE_MONTHS][SNOW_LINE_DAYS]); -byte GetSnowLine(void); -byte HighestSnowLine(void); -byte LowestSnowLine(void); -void ClearSnowLine(void); +byte GetSnowLine(); +byte HighestSnowLine(); +byte LowestSnowLine(); +void ClearSnowLine(); uint GetPartialZ(int x, int y, Slope corners); uint GetSlopeZ(int x, int y); diff --git a/src/saveload/group_sl.cpp b/src/saveload/group_sl.cpp index 33edf51eb..9bce5cd49 100644 --- a/src/saveload/group_sl.cpp +++ b/src/saveload/group_sl.cpp @@ -17,7 +17,7 @@ static const SaveLoad _group_desc[] = { SLE_END() }; -static void Save_GRPS(void) +static void Save_GRPS() { Group *g; @@ -28,7 +28,7 @@ static void Save_GRPS(void) } -static void Load_GRPS(void) +static void Load_GRPS() { int index; diff --git a/src/thread_morphos.cpp b/src/thread_morphos.cpp index f549d2eea..fa378fd8e 100644 --- a/src/thread_morphos.cpp +++ b/src/thread_morphos.cpp @@ -157,7 +157,7 @@ private: * On thread creation, this function is called, which calls the real startup * function. This to get back into the correct instance again. */ - static void Proxy(void) + static void Proxy() { struct Task *child = FindTask(NULL); struct OTTDThreadStartupMessage *msg; diff --git a/src/transparency_gui.cpp b/src/transparency_gui.cpp index c9764fe85..8fde12807 100644 --- a/src/transparency_gui.cpp +++ b/src/transparency_gui.cpp @@ -146,7 +146,7 @@ static const WindowDesc _transparency_desc( _transparency_widgets, _nested_transparency_widgets, lengthof(_nested_transparency_widgets) ); -void ShowTransparencyToolbar(void) +void ShowTransparencyToolbar() { AllocateWindowDescFront<TransparenciesWindow>(&_transparency_desc, 0); } |