Flying System

[Arcadius]

I merged the files for the NPC Flying System (BaseMount.cs, BaseAI.cs, and BaseCreature.cs) and on compilation asked me if I wanted to delete an object, another object, another object, etc... I'm assuming its a serialization problem. So at the suggestion of another member, I deleted BaseMount.cs and replaced it with the merge file. NowI have this code I'm getting the following error on:

if (!attacker.Mounted)
            {
                BlockMountType type = BlockMountType.RidingSwipe;
                IMount mount = defender.Mount;

                if (Core.SA)
                {
                    if (defender.Flying)
                    {
                        type = BlockMountType.RidingSwipeFlying;
                    }
                    else if (mount is EtherealMount)
                    {
                        type = BlockMountType.RidingSwipeEthereal;
                    }
                }

Errors:
+ Abilities/RidingSwipe.cs:
    CS0117: Line 69: 'Server.Mobiles.BlockMountType' does not contain a definition for 'RidingSwipe'
    CS0117: Line 76: 'Server.Mobiles.BlockMountType' does not contain a definition for 'RidingSwipeFlying'
    CS0117: Line 80: 'Server.Mobiles.BlockMountType' does not contain a definition for 'RidingSwipeEthereal'
+ Spells/Gargoyle/SpellDefinitions/FlySpell.cs:
    CS1501: Line 81: No overload for method 'CheckMountAllowed' takes 3 arguments
Scripts: One or more scripts failed to compile or no script files were found.
- Press return to exit, or R to try again.