Fix disappearing planets in network games (they turned into BHs)#8
Open
HAL20000 wants to merge 5 commits intoryanakca:masterfrom
Open
Fix disappearing planets in network games (they turned into BHs)#8HAL20000 wants to merge 5 commits intoryanakca:masterfrom
HAL20000 wants to merge 5 commits intoryanakca:masterfrom
Conversation
Owner
|
Hi! Sorry for the delay. I did a bit of work on merging your changes and Florian Schüller's this morning, but it seems that I broke network games. I'll try to debug that later on this week. Here's the merge branch if you're curious: https://github.com/ryanakca/slingshot/tree/merge-schuellerf-HAL20000 Thanks for your contribution to Slingshot! |
Author
|
Hi!
I have had a quick look on the merge branch and I think it might be
problematic that Florian Schüller's changeswhen trying to fixing the
problems in network mode collide with my changes on fixing it. You
might want to consider reverting his commit
a1da39e
before merging my changes. In any case, I will take a more detailed
look inte the merge in a few days perhaps.
Cheers, HAL20000
…On 2019-06-10 13:16, Ryan Kavanagh wrote:
Hi!
Sorry for the delay. I did a bit of work on merging your changes and
Florian Schüller's this morning, but it seems that I broke network
games. I'll try to debug that later on this week. Here's the merge
branch if you're curious:
https://github.com/ryanakca/slingshot/tree/merge-schuellerf-HAL20000
Thanks for your contribution to Slingshot!
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This fixes a bug in network games: Some plantes would (visually randomly) disappear in the client game. Inspection showed, that the client instance would create Black Holes for any planet of the host instance which has a sprite number (
Planet.n) larger thanMAX_PLANETS, however, this is not sensible. By replacing this with the number of sprites (8 in the current implementation), the bug is fixed. Since the numebr of sprites might change, a corresponding constant was introduced into asSettings.NUM_PLANET_SPRITES.