Fix projectiles being added a frame behind where they are fired and beam weapons not able to hit #5767
Conversation
… makes combat impossible if travelling at speed Revert inital change that fixed adding items to the vector whilst iterating it but introduced the frame lag and instead fix in a simple way.
|
If anyone is interested, my overly clever fix is here: 563d305 |
src/Space.cpp
Outdated
| // https:/pioneerspacesim/pioneer/issues/5695 | ||
| // | ||
| // THIS IS A HACK/WORKAROUND until a more proper solution can be found | ||
| for (size_t i = 0, e = m_bodies.size(); i != e; ++i) { |
There was a problem hiding this comment.
As far as I can tell, this will retain the old behavior where only the bodies present at the start of iteration are actually ticked here. To iterate over new-this-frame bodies, the condition needs to be changed to i != m_bodies.size() - e is evaluated once at the start of the loop and if new bodies are added to the end they will not be updated.
There was a problem hiding this comment.
So... the original behavior used an
for (auto b : m_bodies )
Which expands to
for (auto i = m_bodies.begin(), auto e = m_bodies.end(), i != e; ++i ) { auto b = *i;
So I went for the same logic, which means that their static update wouldn't get called as I wanted to make the code behave as close as possible to how it did before, without the risk of having invalid iterators.
After our IRC Chat, I agree, we should check size() each iteration rather than store it at the start as I think for projectiles (which are often the things added in this loop) we probably want to run their update too.
This will, I think make beam weapons more deadly as they'll hit in the first frame and not the second, and so have not degraded their power at all (if I read it all correctly) :-)
…rame it is added, whereas we weren't before.
JonBooth78
changed the title
This makes combat impossible if travelling at speed
Fixes #5695 and Fixes #5741
Revert initial change that fixed adding items to the vector whilst iterating it but introduced the frame lag and instead fix in a simple way.