diff --git a/OpenRA.Game/Effects/Bullet.cs b/OpenRA.Game/Effects/Bullet.cs index cc84c643d5..e5cee69600 100755 --- a/OpenRA.Game/Effects/Bullet.cs +++ b/OpenRA.Game/Effects/Bullet.cs @@ -66,11 +66,7 @@ namespace OpenRA.Effects if (Projectile.Image != null && Projectile.Image != "none") { - if (Projectile.Rotates) - anim = new Animation(Projectile.Image, () => Traits.Util.GetFacing((dest - src).ToFloat2(), 0)); - else - anim = new Animation(Projectile.Image); - + anim = new Animation(Projectile.Image, () => Traits.Util.GetFacing((dest - src).ToFloat2(), 0)); anim.PlayRepeating("idle"); } } diff --git a/OpenRA.Game/Effects/Missile.cs b/OpenRA.Game/Effects/Missile.cs index 93531dfcef..22e5fc25c2 100755 --- a/OpenRA.Game/Effects/Missile.cs +++ b/OpenRA.Game/Effects/Missile.cs @@ -53,11 +53,7 @@ namespace OpenRA.Effects if (Projectile.Image != null && Projectile.Image != "none") { - if (Projectile.Rotates) - anim = new Animation(Projectile.Image, () => Facing); - else - anim = new Animation(Projectile.Image); - + anim = new Animation(Projectile.Image, () => Facing); anim.PlayRepeating("idle"); } } diff --git a/OpenRA.Game/GameRules/ProjectileInfo.cs b/OpenRA.Game/GameRules/ProjectileInfo.cs index 9ae57844d3..ec60bb164a 100644 --- a/OpenRA.Game/GameRules/ProjectileInfo.cs +++ b/OpenRA.Game/GameRules/ProjectileInfo.cs @@ -34,7 +34,6 @@ namespace OpenRA.GameRules public readonly bool Parachuted = false; public readonly bool Proximity = false; public readonly int ROT = 0; - public readonly bool Rotates = false; public readonly bool Shadow = true; public readonly bool UnderWater = false; public readonly int RangeLimit = 0; diff --git a/mods/cnc/weapons.ini b/mods/cnc/weapons.ini index 07c5e54d60..1e96c8d16b 100644 --- a/mods/cnc/weapons.ini +++ b/mods/cnc/weapons.ini @@ -320,7 +320,6 @@ Proximity=yes ;Ranged=yes Inaccurate=yes Image=MISSILE -Rotates=yes ; small homing missile (targets vehicles best) [HeatSeeker] @@ -334,7 +333,6 @@ Inaccurate=yes AA=yes Image=DRAGON ROT=5 -Rotates=yes Trail=smokey ; anti aircraft missile @@ -343,12 +341,9 @@ Arm=3 High=yes Shadow=no Proximity=yes -;Animates=yes -;Ranged=yes AA=yes Image=MISSILE ROT=20 -Rotates=yes ; lobbed tumbling grenade [Lobbed] @@ -356,16 +351,13 @@ High=yes Arcing=yes Inaccurate=yes Image=BOMB -;Frames=8 ; dropped from plane tumbling object [Bomblet] Arm=24 RangeLimit=24 High=yes -;Dropping=yes Image=BOMBLET -;Frames=7 ; arcing ballistic projectile [BallisticP] diff --git a/mods/ra/rules.ini b/mods/ra/rules.ini index e5f1de6cd2..d3b9b8fe6a 100644 --- a/mods/ra/rules.ini +++ b/mods/ra/rules.ini @@ -469,7 +469,6 @@ Warhead=Nuke ; Parachuted = Equipped with a parachute for dropping from plane (def=no)? ; Proximity = Does it blow up when near its target (def=no)? ; ROT = Rate Of Turn [non zero implies homing] (def=0) -; Rotates = Does the projectile have rotation specific imagery (def=no)? ; Shadow = If High, does this bullet need to have a shadow drawn? (def = yes) ; UnderWater = Does the projectile travel under water? ; Trail = image to use for smoke puffs etc (def=null) @@ -481,7 +480,6 @@ Warhead=Nuke ; special case for dog [LeapDog] Image=DOGBULLT -Rotates=yes Proximity=yes ROT=20 @@ -498,7 +496,6 @@ AG=false [Torpedo] UnderWater=yes Image=MISSILE -Rotates=yes ASW=yes ; Free Rocket Over Ground @@ -510,7 +507,6 @@ Proximity=yes Trail=smokey Inaccurate=yes Image=V2 -Rotates=yes ; small homing missile (targets vehicles best) [HeatSeeker] @@ -523,7 +519,6 @@ Inaccurate=yes AA=yes Image=DRAGON ROT=5 -Rotates=yes RangeLimit=20 ; small missile with deadly accuracy @@ -536,7 +531,6 @@ Trail=smokey AA=yes Image=DRAGON ROT=20 -Rotates=yes RangeLimit=20 ; anti aircraft missile @@ -550,7 +544,6 @@ AA=yes AG=no Image=MISSILE ROT=20 -Rotates=yes RangeLimit=30 ; lobbed tumbling grenade