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

naming conventions (Pascals not camels)

Browse Source
This commit is contained in:
alzeih
2010-02-27 18:53:04 +13:00
parent 39b91bc894
commit 5db5829bb6
2 changed files with 7 additions and 7 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)
{
ScreenShaker.registerShakeEffect(10, self.Location.ToFloat2()*new float2(24, 24), 3);
ScreenShaker.RegisterShakeEffect(10, self.Location.ToFloat2()*new float2(24, 24), 3);
Sound.Play("kaboom22.aud");
}
}

12
OpenRa.Game/Traits/World/ScreenShaker.cs
View File

@@ -14,18 +14,18 @@ namespace OpenRa.Traits
public class ScreenShaker : ITick
{
int ticks = 0;
static List<Tuple<int, float2, int>> shakeEffects = new List<Tuple<int, float2, int>>();
private static List<Tuple<int, float2, int>> shakeEffects = new List<Tuple<int, float2, int>>();
public ScreenShaker (Actor self){}
public void Tick (Actor self)
{
Game.viewport.Scroll(getScrollOffset());
updateList();
UpdateList();
ticks++;
}
private void updateList()
private void UpdateList()
{
var toRemove = new List<Tuple<int, float2, int>>();
@@ -43,7 +43,7 @@ namespace OpenRa.Traits
}
}
public static void registerShakeEffect(int time, float2 position, int intensity)
public static void RegisterShakeEffect(int time, float2 position, int intensity)
{
shakeEffects.Add(Tuple.New<int, float2, int>(time, position, intensity));
}
@@ -53,10 +53,10 @@ namespace OpenRa.Traits
int xFreq = 4;
int yFreq = 5;
return getIntensity() * new float2( (float) Math.Sin((ticks*2*Math.PI)/xFreq) , (float) Math.Cos((ticks*2*Math.PI)/yFreq));
return GetIntensity() * new float2( (float) Math.Sin((ticks*2*Math.PI)/xFreq) , (float) Math.Cos((ticks*2*Math.PI)/yFreq));
}
public float getIntensity()
public float GetIntensity()
{
float intensity = 0;
foreach(Tuple<int, float2, int> tuple in shakeEffects)