epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

32bpp bullets no longer crash without palette.

Browse Source
This commit is contained in:
Andre Mohren
2021-06-30 10:54:39 +02:00
committed by reaperrr
parent 6810469634
commit 8a776c7138
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Projectiles/Bullet.cs
View File

@@ -297,7 +297,11 @@ namespace OpenRA.Mods.Common.Projectiles
.WithAlpha(shadowAlpha); .WithAlpha(shadowAlpha);
} }
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);
foreach (var r in anim.Render(pos, palette)) foreach (var r in anim.Render(pos, palette))
yield return r; yield return r;
} }