Commit Graph
106 Commits
Author SHA1 Message Date
Rubidiumandrubidium42 0fdabca605 Codechange: use std::span instead of custom span in TGP 2024-04-26 06:15:29 +02:00
Rubidiumandrubidium42 b2218e75d4 Codefix: missing space between close parenthesis and open curly brace 2024-04-16 19:28:09 +02:00
Patric StoutandGitHub a3cfd23cf9 Codechange: rename byte to uint8_t (#12308) 2024-03-16 23:59:32 +01:00
froschandfrosch b6c8f301be Codechange: Silence warnings about intentionally unused parameters. 2023-09-19 22:49:59 +02:00
Rubidiumandrubidium42 eaae0bb5e7 Codechange: automatic adding of _t to (u)int types, and WChar to char32_t
for i in `find src -type f|grep -v 3rdparty/fmt|grep -v 3rdparty/catch2|grep -v 3rdparty/opengl|grep -v stdafx.h`; do sed 's/uint16& /uint16 \&/g;s/int8\([ >*),;[]\)/int8_t\1/g;s/int16\([ >*),;[]\)/int16_t\1/g;s/int32\([ >*),;[]\)/int32_t\1/g;s/int64\([ >*),;[]\)/int64_t\1/g;s/ uint32(/ uint32_t(/g;s/_uint8_t/_uint8/;s/Uint8_t/Uint8/;s/ft_int64_t/ft_int64/g;s/uint64$/uint64_t/;s/WChar/char32_t/g;s/char32_t char32_t/char32_t WChar/' -i $i; done
2023-07-19 19:30:14 +02:00
PeterNandGitHub d086f288cd Codechange: Remove duplicated includes. (#10888)
These are now included by stdafx.h so don't need to be included again.
2023-05-29 14:29:00 +01:00
Rubidiumandrubidium42 4a5a9f57c4 Fix: conversion to smaller type warnings 2023-05-06 21:26:13 +02:00
Peter NelsonandPeterN c3cea45ebc Codechange: Rename height_t/amplitude_t to Height/Amplitude. 2023-04-24 09:17:37 +01:00
Peter NelsonandPeterN 3f811246b1 Codechange: Rename control_point_t to ControlPoint.
The _t suffix is reserved by POSIX 1003.1.
2023-04-24 09:17:37 +01:00
Charles PigottandPeterN b282664242 Codechange: Replace all usages of alloca/AllocaM with more modern/less discouraged alternatives 2023-04-15 16:57:00 +01:00
Rubidiumandrubidium42 fe2bcd2a58 Codechange: migrate size related functions to Map structure 2023-01-21 17:11:40 +01:00
Patric StoutandGitHub 1fb101eabb Codechange: address CodeQL issue "Multiplication result converted to larger type" (#10306)
Most are very unlikely to ever be triggered in our codebase; two
stand out: linkgraph and money cheat. Those, potentially, could
wrap earlier than expected.
2023-01-02 20:30:02 +00:00
glx22andLoïc Guilloux 87eb997be0 Codechange: Remove FOR_ALL_TILES_IN_HEIGHT 2021-07-09 21:36:09 +02:00
Patric StoutandPatric Stout 28e90769f7 Codechange: use "[[maybe_unused]]" instead of a wide variety of other ways we had
While at it, replace OTTD_ASSERT with WITH_ASSERT, as this
is always set if assert() is valid. No matter if NDEBUG is set
or not.
2021-06-03 17:30:00 +02:00
Charles PigottandGitHub dd798d688b Fix #8919: Release builds with asserts enabled (#8925) 2021-04-01 23:57:49 +01:00
Patric StoutandGitHub fece1c57ca Codechange: Suppress warnings when asserts are disabled (#8917) 2021-04-01 11:16:19 +02:00
Patric StoutandPatric Stout f05e2e0d40 Feature: allow setting a custom terrain type to define highest peak
At least, TGP will try to reach it. It heavily depends on the map
if it is reachable at all. But for sure it will do its atmost to
get there!
2021-03-26 12:22:32 +01:00
Patric StoutandPatric Stout 422e132845 Feature: auto-detect map height limit based on generated map
This opens up the true power of the TGP terrain generator, as it
is no longer constrainted by an arbitrary low map height limit,
especially for extreme terrain types.

In other words: on a 1kx1k map with "Alpinist" terrain type, the
map is now really hilly with default settings.

People can still manually limit the map height if they so wish,
and after the terrain generation the limit is stored in the
savegame as if the user set it.

Cheats still allow you to change this value.
2021-03-26 12:22:32 +01:00
Patric StoutandPatric Stout 1a1049bc0d Change: rename setting "max_heightlevel" to "map_height_limit"
This better reflects what it is, and hopefully removes a bit of
the confusion people are having what this setting actually does.

Additionally, update the text on the setting to better inform
users what it is doing exactly, so they can make an educated
decision on how to change it.

Next commit will introduce an "auto" value, which should be the
new default. The rename has as added benefit that everyone will
start out on the "auto" value.
2021-03-26 12:22:32 +01:00
Patric StoutandPatric Stout 70bc55cfd6 Feature: setting to indicate desert coverage for tropic climate
This is an indication value; the game tries to get as close as it
can, but due to the complex tropic rules, that is unlikely to be
exact.

In the end, it picks a height-level to base the desert/tropic
line on. This is strictly seen not needed, as we can convert any
tile to either. But it is the simplest way to get started with
this without redoing all related functions.
2021-03-26 12:22:32 +01:00
Patric StoutandPatric Stout cafe4eed6e Feature: setting to indicate snow coverage for arctic climate (replaces snow line height)
Setting the snow coverage (in % of the map) makes a lot more sense
to the human, while still allowing the niche player to set (by
finding the correct %) a snow line height they like. This makes for
easier defaults, as it decoupled terrain height from amount of snow.

Maps can never be 100% snow, as we do not have sprites for coastal
tiles.

Internally, this calculates the best snow line height to approach
this coverage as close as possible.
2021-03-26 12:22:32 +01:00
Patric StoutandGitHub 7463c46a54 Fix: for arctic and tropic, make sure we have at least a few hills (#8513)
Without hills, not all industries can be generated, which means
that with a default configuration you get errors. This is far from
optimal, of course.

This now forces that there is at least some hills, even when you
are using very-flat. This is a stopgap solution, but a proper
solution requires a full rewrite of the terrain generator, which
is not a 2 minute (or even 2 week) job.

To make sure flat is still flat-ish, reduce the default
snow-line-height to 10, making it look a lot better on smaller maps.
This is a compromise between being able to have flat maps and
still having all industries on arctic.
2021-01-08 12:02:38 +01:00
Charles PigottandGitHub 9b800a96ed Codechange: Remove min/max functions in favour of STL variants (#8502) 2021-01-08 11:16:18 +01:00
S. D. CloudtandCharles Pigott 13cc8a0cee Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
Henry WilsonandMichael Lutz 7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 2019-04-10 23:22:20 +02:00
GabdaandCharles Pigott 37bb2c9308 Codechange: Make the style of MakeVoid calls uniform (#7192) 2019-02-08 23:05:25 +00:00
nikolasandCharles Pigott d8ccad91f9 Fix: Some code and comment typos
Found with codespell
2019-01-17 22:01:07 +00:00
frosch d77935f788 (svn r27334) -Revert (r27232) [FS#6342]: No idea what the plan was, but making the main noise coefficients the same for all smoothness types certainly wasn't. 2015-07-16 17:05:40 +00:00
frosch be0b22c9bc (svn r27331) -Cleanup (r26999): Make variety distribution curves more sane. 2015-07-11 11:18:24 +00:00
frosch a11ae39437 (svn r27330) -Fix [FS#6335]: Make variety distribution not assume that sea level is at height 0.2 / 3 * TGPGetMaxHeight(). 2015-07-11 10:46:25 +00:00
frosch b303ba7505 (svn r27329) -Fix: Add more height_t type-correctness to TGP code. 2015-07-11 10:43:34 +00:00
frosch 8437726cca (svn r27328) -Codechange: Add an assertion to check for uninitialised variables when tracing variety distribution's control curves. 2015-07-11 10:41:20 +00:00
alberth 262c3c93c8 (svn r27232) -Fix: Tweak noise generator more precisely for different map sizes (chillcore) 2015-04-11 18:46:01 +00:00
alberth 9db21f6489 (svn r27230) -Fix: Tune down terrain generation to reduce amount of long slopes (chillcore) 2015-04-11 18:44:26 +00:00
alberth f29842316e (svn r27229) -Change: Generate more detailed curves at the coast (chillcore) 2015-04-11 18:43:30 +00:00
alberth 79c3bc081b (svn r27228) -Change: Slightly more water in the non-custom sea levels (chillcore) 2015-04-11 18:42:48 +00:00
alberth 8e2b3d170b (svn r27227) -Codechange: Initialise map at level 0 instead of -32k (chillcore) 2015-04-11 18:41:41 +00:00
rubidium b4b0b2750c (svn r27018) -Fix [FS#6141] (r27008): the higher amplitudes needed for higher maps were not ignored properly causing much smoother maps than wanted 2014-10-14 17:49:32 +00:00
rubidium 8d90e86c2c (svn r27009) -Add: extra level of general map heightness (ChillCore) 2014-10-13 14:22:48 +00:00
rubidium fcdbdd6043 (svn r27008) -Change: extrapolate the amplitudes for the large wavelengths needed for much higher maps 2014-10-13 14:16:20 +00:00
rubidium a1611de3a3 (svn r27007) -Codechange: allow for more frequencies (based on patch by ic111) 2014-10-13 14:14:04 +00:00
rubidium 344a7a0f16 (svn r27006) -Codechange: move getting of the amplitude to a seperate function 2014-10-13 14:12:06 +00:00
rubidium a200656534 (svn r27005) -Fix (r26999): variety distribution curve map scaling did one conversion to height_t too many 2014-10-13 14:07:37 +00:00
rubidium 771dcf3b7b (svn r27003) -Cleanup: fix the use of spaces and asterices "around" some comments 2014-10-12 18:41:53 +00:00
rubidium b0c4a16e9d (svn r27000) -Fix (r26999): compilation error with some versions of GCC 2014-10-12 11:53:13 +00:00
rubidium df5d5e2b8b (svn r26999) -Codechange: make the variety distribution automatically scale to the maximum height of the map 2014-10-12 11:28:45 +00:00
rubidium caf3bda626 (svn r26998) -Change: account for the map size when determining the maximum height of the landscape; a 24 high mountain at 64x64 leaves barely any usable space, but on a 4096x4096 it's just a "small" bump (ic111) 2014-10-12 10:55:49 +00:00
rubidium 92553c9c6b (svn r26997) -Fix/codechange: use signed integers for TGP's internal map size and X/Y variables due to X/Y in comparisons occasionally getting smaller than 0 due to subtractions 2014-10-12 10:49:29 +00:00
rubidium 2a786aa264 (svn r26946) -Fix (r26945): MSVC doesn't seem to have round yet 2014-10-02 17:40:45 +00:00
rubidium a14fad13ed (svn r26945) -Fix-ish: better scaling of the "cells" in which variety distribution happens for non-square maps (attempt to make reasonably square areas) 2014-10-02 17:32:45 +00:00