diff options
| author | rubidium <rubidium@openttd.org> | 2008-05-29 15:13:28 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-05-29 15:13:28 +0000 |
| commit | 923e21129c94c36bb403e955a1f334ef34722e8b (patch) | |
| tree | 59059f0a1aba0794fa770e8c9a19312e4ce300af /src/heightmap.cpp | |
| parent | 2a816fb685b373e38347f809bcdc7f2fdef0139c (diff) | |
| download | openttd-923e21129c94c36bb403e955a1f334ef34722e8b.tar.xz | |
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
Diffstat (limited to 'src/heightmap.cpp')
| -rw-r--r-- | src/heightmap.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/heightmap.cpp b/src/heightmap.cpp index 6c0162503..1add9853c 100644 --- a/src/heightmap.cpp +++ b/src/heightmap.cpp @@ -297,7 +297,7 @@ static void GrayscaleToMapHeights(uint img_width, uint img_height, byte *map) TileIndex tile; /* Get map size and calculate scale and padding values */ - switch (_settings.game_creation.heightmap_rotation) { + switch (_settings_game.game_creation.heightmap_rotation) { default: NOT_REACHED(); case HM_COUNTER_CLOCKWISE: width = MapSizeX(); @@ -322,7 +322,7 @@ static void GrayscaleToMapHeights(uint img_width, uint img_height, byte *map) /* Form the landscape */ for (row = 0; row < height - 1; row++) { for (col = 0; col < width - 1; col++) { - switch (_settings.game_creation.heightmap_rotation) { + switch (_settings_game.game_creation.heightmap_rotation) { default: NOT_REACHED(); case HM_COUNTER_CLOCKWISE: tile = TileXY(col, row); break; case HM_CLOCKWISE: tile = TileXY(row, col); break; @@ -337,7 +337,7 @@ static void GrayscaleToMapHeights(uint img_width, uint img_height, byte *map) /* Use nearest neighbor resizing to scale map data. * We rotate the map 45 degrees (counter)clockwise */ img_row = (((row - row_pad) * num_div) / img_scale); - switch (_settings.game_creation.heightmap_rotation) { + switch (_settings_game.game_creation.heightmap_rotation) { default: NOT_REACHED(); case HM_COUNTER_CLOCKWISE: img_col = (((width - 1 - col - col_pad) * num_div) / img_scale); |