Suffix projectile shadow palette with player name if IsPlayerPalette = true #19917
Conversation
This file contains 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
darkademic
force-pushed
the
pr/projectile-shadow-palette-fix
branch
from
960900e
to
146c71d
Compare
abcdefg30
reviewed
Feb 1, 2022
| @@ -287,21 +287,18 @@ public IEnumerable<IRenderable> Render(WorldRenderer wr) | |||
| var world = args.SourceActor.World; | |||
| if (!world.FogObscures(pos)) | |||
| { | |||
| var palette = wr.Palette(info.Palette + (info.IsPlayerPalette ? args.SourceActor.Owner.InternalName : "")); | |||
There was a problem hiding this comment.
This needs remain
Suggested change
| var palette = wr.Palette(info.Palette + (info.IsPlayerPalette ? args.SourceActor.Owner.InternalName : "")); | |
| var paletteName = info.Palette; | |
| if (paletteName != null && info.IsPlayerPalette) | |
| paletteName += args.SourceActor.Owner.InternalName; | |
| var palette = wr.Palette(paletteName); |
otherwise we're effectively reverting #19476!
(And we might want to adapt the other cases to use the same.)
There was a problem hiding this comment.
Aha! Yea missed that null check, will change.
darkademic
force-pushed
the
pr/projectile-shadow-palette-fix
branch
from
146c71d
to
6a55a60
Compare
abcdefg30
approved these changes
Feb 1, 2022
RoosterDragon
approved these changes
Feb 6, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Missile, Bullet and GravityBomb allow you to set IsPlayerPalette is true, which suffixes the palette name with the player's internal name, however this isn't applied to the shadow palette, which means it'll use the base name. It's possible a palette with the base name doesn't exist while a player suffixed one does, which will result in an exception.
The shadow palette was previously defined separately so won't have been an issue.
These changes just make the shadow use the same palette name as the projectile itself so it's consistent.