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

removed static carp from ScreenShaker

Browse Source
This commit is contained in:
Chris Forbes
2010-02-27 22:16:55 +13:00
parent 220e66dd55
commit d297c58610
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Traits/Building.cs
View File

@@ -94,7 +94,7 @@ namespace OpenRA.Traits
{ {
if (e.DamageState == DamageState.Dead) if (e.DamageState == DamageState.Dead)
{ {
ScreenShaker.RegisterShakeEffect(10, self.CenterLocation, 1); self.World.WorldActor.traits.Get<ScreenShaker>().AddEffect(10, self.CenterLocation, 1);
Sound.Play("kaboom22.aud"); Sound.Play("kaboom22.aud");
} }
} }

32
OpenRA.Game/Traits/World/ScreenShaker.cs
View File

@@ -1,8 +1,26 @@
#region Copyright & License Information
/*
* Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
* This file is part of OpenRA.
*
* OpenRA is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* OpenRA is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with OpenRA. If not, see <http://www.gnu.org/licenses/>.
*/
#endregion
using System; using System;
using System.Linq; using System.Collections.Generic;
using OpenRA.Traits; using System.Linq;
using System.Collections.Generic;
using OpenRA.FileFormats; using OpenRA.FileFormats;
namespace OpenRA.Traits namespace OpenRA.Traits
@@ -14,8 +32,8 @@ namespace OpenRA.Traits
public class ScreenShaker : ITick public class ScreenShaker : ITick
{ {
static int ticks = 0; int ticks = 0;
static List<Tuple<int, float2, int>> shakeEffects = new List<Tuple<int, float2, int>>(); List<Tuple<int, float2, int>> shakeEffects = new List<Tuple<int, float2, int>>();
public void Tick (Actor self) public void Tick (Actor self)
{ {
@@ -24,7 +42,7 @@ namespace OpenRA.Traits
ticks++; ticks++;
} }
public static void RegisterShakeEffect(int time, float2 position, int intensity) public void AddEffect(int time, float2 position, int intensity)
{ {
shakeEffects.Add(Tuple.New(ticks + time, position, intensity)); shakeEffects.Add(Tuple.New(ticks + time, position, intensity));
} }