dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding of _t to (u)int types, and WChar to char32_t

Browse Source 
See: eaae0bb5e
This commit is contained in:
Jonathan G Rennison
2024-01-07 16:41:53 +00:00
parent 55d78a23be
commit 97e6f3062e
655 changed files with 7555 additions and 7555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/station_kdtree.h
View File

@@ -15,8 +15,8 @@
#include "station_base.h"
#include "map_func.h"
inline uint32 Kdtree_StationXYFunc(StationID stid, int dim) { return (dim == 0) ? TileX(BaseStation::Get(stid)->xy) : TileY(BaseStation::Get(stid)->xy); }
typedef Kdtree<StationID, decltype(&Kdtree_StationXYFunc), uint32, int> StationKdtree;
inline uint32_t Kdtree_StationXYFunc(StationID stid, int dim) { return (dim == 0) ? TileX(BaseStation::Get(stid)->xy) : TileY(BaseStation::Get(stid)->xy); }
typedef Kdtree<StationID, decltype(&Kdtree_StationXYFunc), uint32_t, int> StationKdtree;
extern StationKdtree _station_kdtree;
/**
@@ -28,11 +28,11 @@ extern StationKdtree _station_kdtree;
template <typename Func>
void ForAllStationsRadius(TileIndex center, uint radius, Func func)
{
uint32 x1, y1, x2, y2;
x1 = (uint32)std::max<int>(0, TileX(center) - radius);
x2 = (uint32)std::min<int>(TileX(center) + radius + 1, MapSizeX());
y1 = (uint32)std::max<int>(0, TileY(center) - radius);
y2 = (uint32)std::min<int>(TileY(center) + radius + 1, MapSizeY());
uint32_t x1, y1, x2, y2;
x1 = (uint32_t)std::max<int>(0, TileX(center) - radius);
x2 = (uint32_t)std::min<int>(TileX(center) + radius + 1, MapSizeX());
y1 = (uint32_t)std::max<int>(0, TileY(center) - radius);
y2 = (uint32_t)std::min<int>(TileY(center) + radius + 1, MapSizeY());
_station_kdtree.FindContained(x1, y1, x2, y2, [&](StationID id) {
func(Station::Get(id));