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

Simplify update_flicker

Browse source
This commit is contained in:
Kp 2016-01-26 03:45:08 +00:00
parent e3033d939e
commit 5b9ccda8e8
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
similar/main/game.cpp
View file

@ -1668,37 +1668,31 @@ static void flicker_lights()
static std::pair<Flickering_light_array_t::iterator, Flickering_light_array_t::iterator> find_flicker(segnum_t segnum, int sidenum)
{
//see if there's already an entry for this seg/side
auto pr = partial_range(Flickering_lights, Num_flickering_lights);
const auto &&pr = partial_range(Flickering_lights, Num_flickering_lights);
auto predicate = [segnum, sidenum](const flickering_light &f) {
return f.segnum == segnum && f.sidenum == sidenum; //found it!
};
return {std::find_if(pr.begin(), pr.end(), predicate), pr.end()};
}
template <typename F>
static inline void update_flicker(segnum_t segnum, int sidenum, F f)
template <fix timer>
static inline void update_flicker(segnum_t segnum, int sidenum)
{
auto i = find_flicker(segnum, sidenum);
if (i.first != i.second)
f(*i.first);
i.first->timer = timer;
}
//turn flickering off (because light has been turned off)
void disable_flicker(segnum_t segnum,int sidenum)
{
auto F = [](flickering_light &f) {
f.timer = 0x80000000;
};
update_flicker(segnum, sidenum, F);
update_flicker<0x80000000>(segnum, sidenum);
}
//turn flickering off (because light has been turned on)
void enable_flicker(segnum_t segnum,int sidenum)
{
auto F = [](flickering_light &f) {
f.timer = 0;
};
update_flicker(segnum, sidenum, F);
update_flicker<0>(segnum, sidenum);
}
#endif