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

Use ring buffers for tile/landscape candidate queues

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-08-18 18:48:12 +01:00
parent 69683eecb8
commit 7502fbd44b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/landscape.cpp
View File

@@ -35,10 +35,10 @@
#include "town.h" #include "town.h"
#include "3rdparty/cpp-btree/btree_set.h" #include "3rdparty/cpp-btree/btree_set.h"
#include "scope_info.h" #include "scope_info.h"
#include "core/ring_buffer.hpp"
#include <array> #include <array>
#include <list> #include <list>
#include <set> #include <set>
#include <deque>
#include "table/strings.h" #include "table/strings.h"
#include "table/sprites.h" #include "table/sprites.h"
@@ -1359,7 +1359,7 @@ static bool FlowRiver(TileIndex spring, TileIndex begin, uint min_river_length)
SET_MARK(begin); SET_MARK(begin);
/* Breadth first search for the closest tile we can flow down to. */ /* Breadth first search for the closest tile we can flow down to. */
std::deque<TileIndex> queue; ring_buffer<TileIndex> queue;
queue.push_back(begin); queue.push_back(begin);
bool found = false; bool found = false;

4
src/map.cpp
View File

@@ -15,8 +15,8 @@
#include "rail_map.h" #include "rail_map.h"
#include "tunnelbridge_map.h" #include "tunnelbridge_map.h"
#include "3rdparty/cpp-btree/btree_map.h" #include "3rdparty/cpp-btree/btree_map.h"
#include "core/ring_buffer.hpp"
#include <array> #include <array>
#include <deque>
#include <memory> #include <memory>
#if defined(__linux__) #if defined(__linux__)
@@ -442,7 +442,7 @@ bool EnoughContiguousTilesMatchingCondition(TileIndex tile, uint threshold, Test
static_assert(MAX_MAP_TILES_BITS <= 30); static_assert(MAX_MAP_TILES_BITS <= 30);
btree::btree_set<uint32> processed_tiles; btree::btree_set<uint32> processed_tiles;
std::deque<uint32> candidates; ring_buffer<uint32> candidates;
uint matching_count = 0; uint matching_count = 0;
auto process_tile = [&](TileIndex t, DiagDirection exclude_onward_dir) { auto process_tile = [&](TileIndex t, DiagDirection exclude_onward_dir) {