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

Use partial_range for player trigger check

Browse source
This commit is contained in:
Kp 2015-04-19 04:18:53 +00:00
parent b88c232f9f
commit 96d92f6eaf
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
similar/main/object.cpp
View file

@ -1707,21 +1707,26 @@ static void object_move_one(const vobjptridx_t obj)
// also check in player under a lavafall
if (obj->type == OBJ_PLAYER && obj->movement_type==MT_PHYSICS) {
if (previous_segment != obj->segnum) {
if (previous_segment != obj->segnum && n_phys_segs > 1)
{
auto seg0 = vsegptridx(phys_seglist[0]);
#if defined(DXX_BUILD_DESCENT_II)
int old_level = Current_level_num;
#endif
for (uint_fast32_t i = 0; i + 1 < n_phys_segs; ++i)
range_for (const auto i, partial_range(phys_seglist, 1u, n_phys_segs))
{
const auto seg0 = vsegptridx(phys_seglist[i]);
const auto connect_side = find_connect_side(vcsegptridx(phys_seglist[i+1]), seg0);
const auto seg1 = vsegptridx(i);
const auto connect_side = find_connect_side(seg1, seg0);
if (connect_side != -1)
{
check_trigger(seg0, connect_side, obj,0);
#if defined(DXX_BUILD_DESCENT_II)
//maybe we've gone on to the next level. if so, bail!
if (Current_level_num != old_level)
return;
#endif
}
seg0 = seg1;
}
}
#if defined(DXX_BUILD_DESCENT_II)