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

Inline guidebot search into create_buddy_bot

Browse source 
Remove use of a predicate/std::find_if, and switch to structured
bindings to access the enumerated range.
This commit is contained in:
Kp 2021-06-28 03:37:50 +00:00
parent 7b12aac1bb
commit eaf319ac4e
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
similar/main/ai.cpp
View file

@ -2158,18 +2158,15 @@ void create_buddy_bot(void)
{
auto &LevelSharedVertexState = LevelSharedSegmentState.get_vertex_state();
auto &Vertices = LevelSharedVertexState.get_vertices();
const auto &&range = enumerate(partial_const_range(LevelSharedRobotInfoState.Robot_info, LevelSharedRobotInfoState.N_robot_types));
const auto &&predicate = [](const auto &ev) {
const robot_info &robptr = ev.value;
return robptr.companion;
};
const auto &&it = std::find_if(range.begin(), range.end(), predicate);
if (!(it != range.end()))
return;
const auto &&segp = vmsegptridx(ConsoleObject->segnum);
auto &vcvertptr = Vertices.vcptr;
const auto &&object_pos = compute_segment_center(vcvertptr, segp);
create_morph_robot(segp, object_pos, (*it).idx);
for (auto &&[idx, ri] : enumerate(partial_const_range(LevelSharedRobotInfoState.Robot_info, LevelSharedRobotInfoState.N_robot_types)))
{
if (!ri.companion)
continue;
const auto &&segp = vmsegptridx(ConsoleObject->segnum);
const auto &&object_pos = compute_segment_center(Vertices.vcptr, segp);
create_morph_robot(segp, object_pos, idx);
break;
}
}
#endif