TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Rename countarray method size -> max_size

Browse source
This commit is contained in:
Kp 2017-06-10 03:31:03 +00:00
parent 430f7832aa
commit a03291b036
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/include/countarray.h
View file

@ -35,7 +35,7 @@ public:
typedef typename array_type::iterator iterator;
typedef typename array_type::const_iterator const_iterator;
typedef typename array_type::const_reference const_reference;
static typename array_type::size_type size() { return S; }
static typename array_type::size_type max_size() { return S; }
~count_array_t() { clear(); }
count_array_t &operator=(const count_array_t &rhs)
{

2
similar/main/ai.cpp
View file

@ -2090,7 +2090,7 @@ static void init_boss_segments(const object &boss_objp, boss_special_segment_arr
#if DXX_USE_EDITOR
Selected_segs.emplace_back(csegnum);
#endif
if (a.count() >= a.size())
if (a.count() >= a.max_size())
{
tail = head;
sidenum=MAX_SIDES_PER_SEGMENT;

4
similar/main/fvi.cpp
View file

@ -716,7 +716,7 @@ int find_vector_intersection(const fvi_query &fq, fvi_info &hit_data)
fvi_info::segment_array_t::iterator i = hit_data.seglist.find(hit_seg), e = hit_data.seglist.end();
if (i != e)
hit_data.seglist.erase(++i);
else if (hit_data.seglist.count() < hit_data.seglist.size())
else if (hit_data.seglist.count() < hit_data.seglist.max_size())
hit_data.seglist.emplace_back(hit_seg);
}
@ -784,7 +784,7 @@ static void append_segments(fvi_info::segment_array_t &dst, const fvi_info::segm
/* Avoid overflow. Original code had n_segs < MAX_SEGS_VISITED-1,
* so leave an extra slot on min.
*/
size_t scount = src.count(), dcount=dst.count(), count = std::min(scount, dst.size() - dcount - 1);
size_t scount = src.count(), dcount=dst.count(), count = std::min(scount, dst.max_size() - dcount - 1);
std::copy(src.begin(), src.begin() + count, std::back_inserter(dst));
}