Fix glitch of burning building animation #639
Conversation
Make BurningBuildingFrame a vector of objects instead of smart-pointers. CclDefineBurningBuilding: Put elements directly into correct position in vector.
Fixes fire stopping to burn when hitpoints reach zero percent.
src/include/util.h
Outdated
| @@ -323,6 +323,12 @@ namespace ranges | |||
| std::sort(std::begin(range), std::end(range), std::forward<Comparer>(comparer)); | |||
| } | |||
|
|
|||
| template <typename Range, typename Comparer = std::less<>> | |||
| bool is_sorted(Range &range, Comparer &&comparer = {}) | |||
There was a problem hiding this comment.
And if you are familiar enough, projection (see above typename Proj = identity for find)
So we would have:
bool is_BurningBuildingFramesSorted()
{
return range::is_sorted(BurningBuildingFrames, std::greater<>{}, &Frame::Percent);
}
There was a problem hiding this comment.
I have seen projections, but is that possible with c++17 ?
Update: I will have a look at "find". I did not get that you referred to an existing implementation in util.h
There was a problem hiding this comment.
I mean like that:
template <typename Range, typename Comparer = std::less<>, typename Proj = identity>
bool is_sorted(const Range &range, Comparer &&comparer = {}, Proj &&proj = {}) {
return std::is_sorted(std::begin(range), std::end(range),
[&](const auto& lhs, const auto& rhs){
return comparer(std::invoke(proj, lhs), std::invoke(proj, rhs);
});
}
There was a problem hiding this comment.
That part I got rather quickly after I found the code above.
There was a problem hiding this comment.
done. Just needed to use a lambda for the projection (Otherwise the code would not be generic, or ugly)
e.g.
typedef typename std::iterator_traits<decltype(range.begin())>::value_type T;
...
then use &T::Percent
There was a problem hiding this comment.
Mostly because of intermediate IsPercentDecreasingValid (used only once).
If code is inlined/moved directly in IsBurningBuildingFramesValid(), it would be possible.
There was a problem hiding this comment.
Sure.
I still wonder if we should combine the percentage-lookup of construction and burning?
If yes, it should still be in a separate PR, I think.
That would require the code to be generic/put in header.
How should the signature of such a percentage-lookup function look like?
src/missile/missile.cpp
Outdated
| @@ -1172,7 +1172,8 @@ int ViewPointDistanceToMissile(const Missile &missile) | |||
| */ | |||
| MissileType *MissileBurningBuilding(int percent) | |||
| { | |||
| for (auto &frame : BurningBuildingFrames) { | |||
| for (int i = BurningBuildingFrames.size() - 1; i >= 0; --i) { | |||
There was a problem hiding this comment.
Dangerous to mix signed/unsigned like that.
But changed afterward :-)
Burning animation disappears before building is completely destroyed.
Fix and add unittest.
Simplify storage a bit.
Comment: Percent logic is similar to construction. Code could be combined.
State before:
Burning at 6/400=1.5%:
No longer burning at 2/400=0.5%:
