openttd-ottdgrfs: comparison src/tgp.cpp

equal deleted inserted replaced

-:4bf29d14edba
+:c30fe89622df
 /** Fixed point array for amplitudes (and percent values) */
 typedef int amplitude_t;
 static const int amplitude_decimal_bits = 10;
 /** Height map - allocated array of heights (MapSizeX() + 1) x (MapSizeY() + 1) */
-typedef struct HeightMap
+struct HeightMap
 {
 	height_t *h;         //! array of heights
 	uint     dim_x;      //! height map size_x MapSizeX() + 1
 	uint     total_size; //! height map total size
 	uint     size_x;     //! MapSizeX()
 	uint     size_y;     //! MapSizeY()
-} HeightMap;
+};
 /** Global height map instance */
 static HeightMap _height_map = {NULL, 0, 0, 0, 0};
 /** Height map accessors */
 	return ((int)x) >= 0 && x < _height_map.size_x && ((int)y) >= 0 && y < _height_map.size_y;
 }
 /** Allocate array of (MapSizeX()+1)*(MapSizeY()+1) heights and init the _height_map structure members */
-static inline bool AllocHeightMap(void)
+static inline bool AllocHeightMap()
 {
 	height_t *h;
 	_height_map.size_x = MapSizeX();
 	_height_map.size_y = MapSizeY();
 	return true;
 }
 /** Free height map */
-static inline void FreeHeightMap(void)
+static inline void FreeHeightMap()
 {
 	if (_height_map.h == NULL) return;
 	free(_height_map.h);
 	_height_map.h = NULL;
 }
 	}
 	return (step > 1);
 }
 /** Base Perlin noise generator - fills height map with raw Perlin noise */
-static void HeightMapGenerate(void)
+static void HeightMapGenerate()
 {
 	uint size_min = min(_height_map.size_x, _height_map.size_y);
 	uint iteration_round = 0;
 	amplitude_t amplitude;
 	bool continue_iteration;
 * a larger map.
 *
 * Please note that all the small numbers; 53, 101, 167, etc. are small primes
 * to help give the perlin noise a bit more of a random feel.
 */
-static void HeightMapCoastLines(void)
+static void HeightMapCoastLines()
 {
 	int smallest_size = min(_patches.map_x, _patches.map_y);
 	const int margin = 4;
 	uint y, x;
 	double max_x;
 		h_prev = h;
 	}
 }
 /** Smooth coasts by modulating height of tiles close to map edges with cosine of distance from edge */
-static void HeightMapSmoothCoasts(void)
+static void HeightMapSmoothCoasts()
 {
 	uint x, y;
 	/* First Smooth NW and SE coasts (y close to 0 and y close to size_y) */
 	for (x = 0; x < _height_map.size_x; x++) {
 		HeightMapSmoothCoastInDirection(x, 0, 0, 1);
 /** Height map terraform post processing:
 *  - water level adjusting
 *  - coast Smoothing
 *  - slope Smoothing
 *  - height histogram redistribution by sine wave transform */
-static void HeightMapNormalize(void)
+static void HeightMapNormalize()
 {
 	const amplitude_t water_percent = _water_percent[_opt.diff.quantity_sea_lakes];
 	const height_t h_max_new = I2H(_max_height[_opt.diff.terrain_type]);
 	const height_t roughness = 7 + 3 * _patches.tgen_smoothness;
 * different to all others to give a desert valley between two high mountains.
 * Clearly if a low height terrain (flat/very flat) is chosen, then the tropic
 * areas wont be high enough, and there will be very little tropic on the map.
 * Thus Tropic works best on Hilly or Mountainous.
 */
-void GenerateTerrainPerlin(void)
+void GenerateTerrainPerlin()
 {
 	uint x, y;
 	if (!AllocHeightMap()) return;
 	GenerateWorldSetAbortCallback(FreeHeightMap);

branch	cpp_gui
changeset 6298	c30fe89622df
parent 5860	7fdc9b423ba1
child 6303	84c215fc8eb8