Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: black holes and worm holes do not affect zones, beams and electric explosions #961 #1076

Merged
merged 1 commit into from Oct 6, 2020

Conversation

czenker
Copy link
Contributor

@czenker czenker commented Oct 6, 2020

closes #961

@@ -65,6 +65,10 @@ void BlackHole::collide(Collisionable* target, float collision_force)
if (update_delta == 0.0)
return;

P<SpaceObject> obj = P<Collisionable>(target);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@daid As far as I know all Collisionables inside EE are also SpaceObjects, right?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but still, checking is good practice and very cheap.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm always checking. 😆

I was asking, because with returning early any non-spaceObject Collisionable would not be moved as before. I could have made this clearer in the question.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it is a spaceobject, we do not really care about it now, as no wait to check if it has weight :)

@daid daid merged commit 8ce7d38 into daid:master Oct 6, 2020
olivier-vm pushed a commit to olivier-vm/EmptyEpsilon-Clones that referenced this pull request Aug 30, 2021
fix: black holes and worm holes do not affect zones, beams and electric explosions daid#961
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Feature request: Be able to configure zones to ignore black holes
2 participants