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

Avoid repeated valptridx dereferences in create_n_segment_path

Browse source
This commit is contained in:
Kp 2022-02-05 13:30:56 +00:00
parent a418a0c7f9
commit fd33402354
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
similar/main/aipath.cpp
View file

@ -817,17 +817,18 @@ void create_path_to_station(const vmobjptridx_t objp, int max_length)
// Create a path of length path_length for an object, stuffing info in ai_info field. // Create a path of length path_length for an object, stuffing info in ai_info field.
void create_n_segment_path(const vmobjptridx_t objp, unsigned path_length, const imsegidx_t avoid_seg) void create_n_segment_path(const vmobjptridx_t objp, unsigned path_length, const imsegidx_t avoid_seg)
{ {
ai_static *aip=&objp->ctype.ai_info; auto &obj = *objp;
ai_local *ailp = &objp->ctype.ai_info.ail; ai_static *const aip = &obj.ctype.ai_info;
ai_local *const ailp = &obj.ctype.ai_info.ail;
const auto &&cr0 = create_path_points(objp, objp->segnum, segment_exit, Point_segs_free_ptr, path_length, create_path_random_flag::random, create_path_safety_flag::unsafe, avoid_seg); const auto &&cr0 = create_path_points(objp, obj.segnum, segment_exit, Point_segs_free_ptr, path_length, create_path_random_flag::random, create_path_safety_flag::unsafe, avoid_seg);
aip->path_length = cr0.second; aip->path_length = cr0.second;
if (cr0.first == create_path_result::early) if (cr0.first == create_path_result::early)
{ {
Point_segs_free_ptr += aip->path_length; Point_segs_free_ptr += aip->path_length;
for (;;) for (;;)
{ {
const auto &&crf = create_path_points(objp, objp->segnum, segment_exit, Point_segs_free_ptr, --path_length, create_path_random_flag::random, create_path_safety_flag::unsafe, segment_none); const auto &&crf = create_path_points(objp, obj.segnum, segment_exit, Point_segs_free_ptr, --path_length, create_path_random_flag::random, create_path_safety_flag::unsafe, segment_none);
aip->path_length = crf.second; aip->path_length = crf.second;
if (crf.first != create_path_result::early) if (crf.first != create_path_result::early)
break; break;