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

Merge pull request #12713 from pchote/fix-paused-weather-scroll

Browse Source 
Fix weather particle positions when scrolling while paused.
This commit is contained in:
Matthias Mailänder
2017-02-08 08:39:36 +01:00
committed by GitHub
parent c3eab17112 609e0d0f3e
commit bad3a645a3
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenRA.Mods.Common/Traits/World/WeatherOverlay.cs
View File

@@ -263,15 +263,20 @@ namespace OpenRA.Mods.Common.Traits
void UpdateWeatherOverlay(WorldRenderer wr) void UpdateWeatherOverlay(WorldRenderer wr)
{ {
ParticlesCountLogic(wr); if (!world.Paused)
ParticlesCountLogic(wr);
for (var i = 0; i < particleList.Count; i++) for (var i = 0; i < particleList.Count; i++)
{ {
Particle tempParticle = particleList[i]; Particle tempParticle = particleList[i];
XAxisSwing(ref tempParticle); if (!world.Paused)
WindLogic(ref tempParticle); {
Movement(ref tempParticle); XAxisSwing(ref tempParticle);
WindLogic(ref tempParticle);
Movement(ref tempParticle);
}
AntiScroll(ref tempParticle, wr); AntiScroll(ref tempParticle, wr);
EdgeCheckReplace(ref tempParticle, wr); EdgeCheckReplace(ref tempParticle, wr);
@@ -300,8 +305,7 @@ namespace OpenRA.Mods.Common.Traits
void IRenderAboveWorld.RenderAboveWorld(Actor self, WorldRenderer wr) void IRenderAboveWorld.RenderAboveWorld(Actor self, WorldRenderer wr)
{ {
if (!world.Paused) UpdateWeatherOverlay(wr);
UpdateWeatherOverlay(wr);
DrawWeatherOverlay(wr); DrawWeatherOverlay(wr);
} }