Merge branch 'master' into jgrpp

# Conflicts:
#	src/network/network_server.cpp
This commit is contained in:
Jonathan G Rennison
2024-04-18 17:37:25 +01:00
8 changed files with 58 additions and 41 deletions

View File

@@ -180,7 +180,7 @@ public:
TrackdirBits dirs = follower.m_new_td_bits;
const TrackdirBits dirs_without_90_degree = dirs & ~TrackdirCrossesTrackdirs(dir);
if (dirs_without_90_degree != TRACKDIR_BIT_NONE) dirs = dirs_without_90_degree;
const int strip_amount = _random.Next(CountBits(dirs));
const int strip_amount = RandomRange(CountBits(dirs));
for (int s = 0; s < strip_amount; ++s) RemoveFirstTrackdir(&dirs);
return { follower.m_new_tile, FindFirstTrackdir(dirs) };
}