Codechange: making the style of MakeVoid calls uniform #7192

GabdaZM · 2019-02-07T18:32:05Z

Started form making sizex * y + x into TileXY(x, y).

LordAro

Good in principle, though I'm not a fan of the const uint maxX/Y additions. No point making a constant that's only used in one place. Probably not worth it for the other places either - any half decent compiler will optimise them out (is the function itself marked inline?)

I'd recommend looking for other potential uses of TileXY as well, I have no doubt there are many others

Oh, and the commit should be Codechange: ... when no user visible changes are made

GabdaZM · 2019-02-07T20:41:09Z

@LordAro: Can you have a look at the first version, 87eacea? That was without the extra variables.
I'll change the commit message.


        Codechange: making the style of MakeVoid calls uniform

LordAro · 2019-02-08T23:04:31Z

src/tgp.cpp

@@ -995,8 +995,8 @@ void GenerateTerrainPerlin()

 	/* First make sure the tiles at the north border are void tiles if needed. */
 	if (_settings_game.construction.freeform_edges) {
-		for (int y = 0; y < _height_map.size_y - 1; y++) MakeVoid(_height_map.size_x * y);
-		for (int x = 0; x < _height_map.size_x;     x++) MakeVoid(x);


seems to me like _height_map could go away entirely, but that's for another time :)


        Codechange: Make the style of MakeVoid calls uniform (OpenTTD#7192)

GabdaZM force-pushed the GabdaZM:void branch from 87eacea to 7497d58 Feb 7, 2019

LordAro requested changes Feb 7, 2019

View changes

Codechange: making the style of MakeVoid calls uniform

Loading status checks…

3db2970

GabdaZM force-pushed the GabdaZM:void branch from 7497d58 to 3db2970 Feb 8, 2019

GabdaZM changed the title ~~Change: making the style of MakeVoid calls uniform~~ Codechange: making the style of MakeVoid calls uniform Feb 8, 2019

LordAro approved these changes Feb 8, 2019

View changes

LordAro merged commit 37bb2c9 into OpenTTD:master Feb 8, 2019
1 check passed

1 check passed

OpenTTD CI Build #20190208.8 succeeded
Details

GabdaZM deleted the GabdaZM:void branch Feb 11, 2019

nielsmh added a commit to nielsmh/OpenTTD that referenced this pull request Mar 11, 2019

Codechange: Make the style of MakeVoid calls uniform (OpenTTD#7192)

8d125aa

OpenTTD/OpenTTD

Codechange: making the style of MakeVoid calls uniform #7192

Codechange: making the style of MakeVoid calls uniform #7192

GabdaZM commented Feb 7, 2019 •

edited

LordAro left a comment

This comment has been minimized.

GabdaZM commented Feb 7, 2019

This comment has been minimized.

Sponsor OpenTTD/OpenTTD

OpenTTD/OpenTTD

Join GitHub today

Codechange: making the style of MakeVoid calls uniform #7192

Codechange: making the style of MakeVoid calls uniform #7192

Conversation

GabdaZM commented Feb 7, 2019 • edited

LordAro left a comment

This comment has been minimized.

GabdaZM commented Feb 7, 2019

This comment has been minimized.

LordAro Feb 8, 2019

GabdaZM commented Feb 7, 2019 •

edited