From bd74b29ea3f0aba5aacb4ce7069f3e1acc93c44d Mon Sep 17 00:00:00 2001 From: Bob Date: Thu, 8 Jul 2010 16:04:18 +1200 Subject: [PATCH] move projectile effects into mod --- OpenRA.Game/Effects/Smoke.cs | 2 +- OpenRA.Game/Graphics/CursorSequence.cs | 2 +- OpenRA.Game/Graphics/SequenceProvider.cs | 2 +- OpenRA.Game/OpenRA.Game.csproj | 5 ----- {OpenRA.Game => OpenRA.Mods.RA}/Effects/Bullet.cs | 3 ++- {OpenRA.Game => OpenRA.Mods.RA}/Effects/GravityBomb.cs | 3 ++- {OpenRA.Game => OpenRA.Mods.RA}/Effects/LaserZap.cs | 5 +++-- {OpenRA.Game => OpenRA.Mods.RA}/Effects/Missile.cs | 3 ++- {OpenRA.Game => OpenRA.Mods.RA}/Effects/TeslaZap.cs | 3 ++- OpenRA.Mods.RA/OpenRA.Mods.RA.csproj | 5 +++++ 10 files changed, 19 insertions(+), 14 deletions(-) rename {OpenRA.Game => OpenRA.Mods.RA}/Effects/Bullet.cs (95%) rename {OpenRA.Game => OpenRA.Mods.RA}/Effects/GravityBomb.cs (93%) mode change 100644 => 100755 rename {OpenRA.Game => OpenRA.Mods.RA}/Effects/LaserZap.cs (90%) mode change 100644 => 100755 rename {OpenRA.Game => OpenRA.Mods.RA}/Effects/Missile.cs (95%) rename {OpenRA.Game => OpenRA.Mods.RA}/Effects/TeslaZap.cs (95%) diff --git a/OpenRA.Game/Effects/Smoke.cs b/OpenRA.Game/Effects/Smoke.cs index f67637401d..250fbff273 100755 --- a/OpenRA.Game/Effects/Smoke.cs +++ b/OpenRA.Game/Effects/Smoke.cs @@ -24,7 +24,7 @@ using OpenRA.Traits; namespace OpenRA.Effects { - class Smoke : IEffect + public class Smoke : IEffect { readonly int2 pos; readonly Animation anim; diff --git a/OpenRA.Game/Graphics/CursorSequence.cs b/OpenRA.Game/Graphics/CursorSequence.cs index 1b851d7a60..c00ab28408 100644 --- a/OpenRA.Game/Graphics/CursorSequence.cs +++ b/OpenRA.Game/Graphics/CursorSequence.cs @@ -22,7 +22,7 @@ using System.Xml; namespace OpenRA.Graphics { - class CursorSequence + public class CursorSequence { readonly int start, length; diff --git a/OpenRA.Game/Graphics/SequenceProvider.cs b/OpenRA.Game/Graphics/SequenceProvider.cs index 4d2fd1b3ae..77cea88f3f 100644 --- a/OpenRA.Game/Graphics/SequenceProvider.cs +++ b/OpenRA.Game/Graphics/SequenceProvider.cs @@ -27,7 +27,7 @@ using OpenRA.FileFormats; namespace OpenRA.Graphics { - static class SequenceProvider + public static class SequenceProvider { static Dictionary> units; static Dictionary cursors; diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj index 865fb10c03..dfc2308e5b 100755 --- a/OpenRA.Game/OpenRA.Game.csproj +++ b/OpenRA.Game/OpenRA.Game.csproj @@ -77,7 +77,6 @@ - @@ -106,11 +105,9 @@ - - @@ -122,7 +119,6 @@ - @@ -143,7 +139,6 @@ - diff --git a/OpenRA.Game/Effects/Bullet.cs b/OpenRA.Mods.RA/Effects/Bullet.cs similarity index 95% rename from OpenRA.Game/Effects/Bullet.cs rename to OpenRA.Mods.RA/Effects/Bullet.cs index 60c271f66b..b9153cfd50 100755 --- a/OpenRA.Game/Effects/Bullet.cs +++ b/OpenRA.Mods.RA/Effects/Bullet.cs @@ -20,11 +20,12 @@ using System.Collections.Generic; using System.Linq; +using OpenRA.Effects; using OpenRA.GameRules; using OpenRA.Graphics; using OpenRA.Traits; -namespace OpenRA.Effects +namespace OpenRA.Mods.RA.Effects { public class BulletInfo : IProjectileInfo { diff --git a/OpenRA.Game/Effects/GravityBomb.cs b/OpenRA.Mods.RA/Effects/GravityBomb.cs old mode 100644 new mode 100755 similarity index 93% rename from OpenRA.Game/Effects/GravityBomb.cs rename to OpenRA.Mods.RA/Effects/GravityBomb.cs index e8f448bbc6..de86a4dd92 --- a/OpenRA.Game/Effects/GravityBomb.cs +++ b/OpenRA.Mods.RA/Effects/GravityBomb.cs @@ -19,11 +19,12 @@ #endregion using System.Collections.Generic; +using OpenRA.Effects; using OpenRA.GameRules; using OpenRA.Graphics; using OpenRA.Traits; -namespace OpenRA.Effects +namespace OpenRA.Mods.RA.Effects { public class GravityBombInfo : IProjectileInfo { diff --git a/OpenRA.Game/Effects/LaserZap.cs b/OpenRA.Mods.RA/Effects/LaserZap.cs old mode 100644 new mode 100755 similarity index 90% rename from OpenRA.Game/Effects/LaserZap.cs rename to OpenRA.Mods.RA/Effects/LaserZap.cs index c78120f358..122dab6f38 --- a/OpenRA.Game/Effects/LaserZap.cs +++ b/OpenRA.Mods.RA/Effects/LaserZap.cs @@ -20,10 +20,11 @@ using System.Collections.Generic; using System.Drawing; +using OpenRA.Effects; using OpenRA.GameRules; using OpenRA.Traits; -namespace OpenRA.Effects +namespace OpenRA.Mods.RA.Effects { class LaserZapInfo : IProjectileInfo { @@ -75,7 +76,7 @@ namespace OpenRA.Effects float2 norm = new float2(-unit.Y, unit.X); for (int i = -radius; i < radius; i++) - Game.world.WorldRenderer.lineRenderer.DrawLine(args.src + i * norm, args.dest + i * norm, rc, rc); + Game.world.WorldRenderer.DrawLine(args.src + i * norm, args.dest + i * norm, rc, rc); yield break; } diff --git a/OpenRA.Game/Effects/Missile.cs b/OpenRA.Mods.RA/Effects/Missile.cs similarity index 95% rename from OpenRA.Game/Effects/Missile.cs rename to OpenRA.Mods.RA/Effects/Missile.cs index b2d30808a2..0108a7b5fc 100755 --- a/OpenRA.Game/Effects/Missile.cs +++ b/OpenRA.Mods.RA/Effects/Missile.cs @@ -21,11 +21,12 @@ using System; using System.Collections.Generic; using System.Linq; +using OpenRA.Effects; using OpenRA.GameRules; using OpenRA.Graphics; using OpenRA.Traits; -namespace OpenRA.Effects +namespace OpenRA.Mods.RA.Effects { class MissileInfo : IProjectileInfo { diff --git a/OpenRA.Game/Effects/TeslaZap.cs b/OpenRA.Mods.RA/Effects/TeslaZap.cs similarity index 95% rename from OpenRA.Game/Effects/TeslaZap.cs rename to OpenRA.Mods.RA/Effects/TeslaZap.cs index 7f58bba1c4..01671592af 100755 --- a/OpenRA.Game/Effects/TeslaZap.cs +++ b/OpenRA.Mods.RA/Effects/TeslaZap.cs @@ -21,11 +21,12 @@ using System; using System.Collections.Generic; using System.Linq; +using OpenRA.Effects; using OpenRA.GameRules; using OpenRA.Graphics; using OpenRA.Traits; -namespace OpenRA.Effects +namespace OpenRA.Mods.RA.Effects { class TeslaZapInfo : IProjectileInfo { diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj index 2becaaada1..7629fe2562 100644 --- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj +++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj @@ -71,6 +71,11 @@ + + + + +