warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removes redundant delegate type declarations

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 14:32:04 -07:00
parent 3c9842ee5a
commit c85b0a740c
317 changed files with 898 additions and 903 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Scripts/Items/Skill Items/Camping/Bedroll.cs
View file

@ -64,7 +64,7 @@ namespace Server.Items
m_Entry = entry;
m_Bedroll = bedroll;
m_CloseTimer = Timer.DelayCall( TimeSpan.FromSeconds( 10.0 ), new TimerCallback( CloseGump ) );
m_CloseTimer = Timer.DelayCall( TimeSpan.FromSeconds( 10.0 ), CloseGump );
AddBackground( 0, 0, 400, 350, 0xA28 );

2
Scripts/Items/Skill Items/Camping/Campfire.cs
View file

@ -42,7 +42,7 @@ namespace Server.Items
m_Entries = new ArrayList();
m_Created = DateTime.UtcNow;
m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 1.0 ), TimeSpan.FromSeconds( 1.0 ), new TimerCallback( OnTick ) );
m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 1.0 ), TimeSpan.FromSeconds( 1.0 ), OnTick );
}
public Campfire( Serial serial ) : base( serial )

2
Scripts/Items/Skill Items/Carpenter Items/TaxidermyKit.cs
View file

@ -294,7 +294,7 @@ namespace Server.Items
}
}
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( FixMovingCrate ) );
Timer.DelayCall( TimeSpan.Zero, FixMovingCrate );
}
private void FixMovingCrate()

2
Scripts/Items/Skill Items/Fishing/Misc/SpecialFishingNet.cs
View file

@ -104,7 +104,7 @@ namespace Server.Items
else if ( IsChildOf( from.Backpack ) )
{
from.SendLocalizedMessage( 1010484 ); // Where do you wish to use the net?
from.BeginTarget( -1, true, TargetFlags.None, new TargetCallback( OnTarget ) );
from.BeginTarget( -1, true, TargetFlags.None, OnTarget );
}
else
{

2
Scripts/Items/Skill Items/Magical/Misc/Moongate.cs
View file

@ -326,7 +326,7 @@ namespace Server.Items
if ( m_GumpWidth > 0 && m_GumpHeight > 0 && m_TitleNumber > 0 && (m_MessageNumber > 0 || m_MessageString != null) )
{
from.CloseGump( typeof( WarningGump ) );
from.SendGump( new WarningGump( m_TitleNumber, m_TitleColor, m_MessageString == null ? (object)m_MessageNumber : (object)m_MessageString, m_MessageColor, m_GumpWidth, m_GumpHeight, new WarningGumpCallback( Warning_Callback ), from ) );
from.SendGump( new WarningGump( m_TitleNumber, m_TitleColor, m_MessageString == null ? (object)m_MessageNumber : (object)m_MessageString, m_MessageColor, m_GumpWidth, m_GumpHeight, Warning_Callback, from ) );
}
else
{

2
Scripts/Items/Skill Items/Magical/Misc/PotionKeg.cs
View file

@ -79,7 +79,7 @@ namespace Server.Items
}
if ( version < 1 )
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( UpdateWeight ) );
Timer.DelayCall( TimeSpan.Zero, UpdateWeight );
}
public override int LabelNumber

4
Scripts/Items/Skill Items/Magical/Potions/Confusion Blast Potions/BaseConfusionBlastPotion.cs
View file

@ -90,7 +90,7 @@ namespace Server.Items
// Effects
Effects.PlaySound( loc, map, 0x207 );
Geometry.Circle2D( loc, map, Radius, new DoEffect_Callback( BlastEffect ), 270, 90 );
Geometry.Circle2D( loc, map, Radius, BlastEffect, 270, 90 );
Timer.DelayCall( TimeSpan.FromSeconds( 0.3 ), new TimerStateCallback( CircleEffect2 ), new object[] { loc, map } );
@ -117,7 +117,7 @@ namespace Server.Items
{
object[] states = (object[]) state;
Geometry.Circle2D( (Point3D)states[0], (Map)states[1], Radius, new DoEffect_Callback( BlastEffect ), 90, 270 );
Geometry.Circle2D( (Point3D)states[0], (Map)states[1], Radius, BlastEffect, 90, 270 );
}
#endregion

10
Scripts/Items/Skill Items/Magical/Spellbook.cs
View file

@ -47,17 +47,17 @@ namespace Server.Items
public static void Initialize()
{
EventSink.OpenSpellbookRequest += new OpenSpellbookRequestEventHandler( EventSink_OpenSpellbookRequest );
EventSink.CastSpellRequest += new CastSpellRequestEventHandler( EventSink_CastSpellRequest );
EventSink.OpenSpellbookRequest += EventSink_OpenSpellbookRequest;
EventSink.CastSpellRequest += EventSink_CastSpellRequest;
CommandSystem.Register( "AllSpells", AccessLevel.GameMaster, new CommandEventHandler( AllSpells_OnCommand ) );
CommandSystem.Register( "AllSpells", AccessLevel.GameMaster, AllSpells_OnCommand );
}
[Usage( "AllSpells" )]
[Description( "Completely fills a targeted spellbook with scrolls." )]
private static void AllSpells_OnCommand( CommandEventArgs e )
{
e.Mobile.BeginTarget( -1, false, TargetFlags.None, new TargetCallback( AllSpells_OnTarget ) );
e.Mobile.BeginTarget( -1, false, TargetFlags.None, AllSpells_OnTarget );
e.Mobile.SendMessage( "Target the spellbook to fill." );
}
@ -76,7 +76,7 @@ namespace Server.Items
}
else
{
from.BeginTarget( -1, false, TargetFlags.None, new TargetCallback( AllSpells_OnTarget ) );
from.BeginTarget( -1, false, TargetFlags.None, AllSpells_OnTarget );
from.SendMessage( "That is not a spellbook. Try again." );
}
}

2
Scripts/Items/Skill Items/Misc/Bandage.cs
View file

@ -14,7 +14,7 @@ namespace Server.Items
public static void Initialize()
{
EventSink.BandageTargetRequest += new BandageTargetRequestEventHandler(EventSink_BandageTargetRequest);
EventSink.BandageTargetRequest += EventSink_BandageTargetRequest;
}
[Constructible]

2
Scripts/Items/Skill Items/Musical Instruments/BaseInstrument.cs
View file

@ -361,7 +361,7 @@ namespace Server.Items
}
if ( m_UsesRemaining != oldUses )
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( InvalidateProperties ) );
Timer.DelayCall( TimeSpan.Zero, InvalidateProperties );
}
public override void OnSingleClick( Mobile from )

8
Scripts/Items/Skill Items/Ninjitsu/NinjaWeapons.cs
View file

@ -44,7 +44,7 @@ namespace Server.Items
{
if (CanUseWeapon(from, weapon))
{
from.BeginTarget(weapon.WeaponMaxRange, false, TargetFlags.Harmful, new TargetStateCallback<INinjaWeapon>(OnTarget), weapon);
from.BeginTarget(weapon.WeaponMaxRange, false, TargetFlags.Harmful, OnTarget, weapon);
}
}
@ -66,10 +66,10 @@ namespace Server.Items
if (CombatCheck(from, target))
{
Timer.DelayCall(TimeSpan.FromSeconds(1.0), new TimerStateCallback<object[]>(OnHit), new object[] { from, target, weapon });
Timer.DelayCall(TimeSpan.FromSeconds(1.0), OnHit, new object[] { from, target, weapon });
}
Timer.DelayCall(TimeSpan.FromSeconds(2.5), new TimerStateCallback<PlayerMobile>(ResetUsing), from);
Timer.DelayCall(TimeSpan.FromSeconds(2.5), ResetUsing, from);
}
else
{
@ -356,7 +356,7 @@ namespace Server.Items
{
if (WeaponIsValid(weapon, Owner.From))
{
Owner.From.BeginTarget(10, false, TargetFlags.Harmful, new TargetStateCallback<INinjaWeapon>(OnTarget), weapon);
Owner.From.BeginTarget(10, false, TargetFlags.Harmful, OnTarget, weapon);
}
}
}

4
Scripts/Items/Skill Items/Tailor Items/Misc/Dyes.cs
View file

@ -92,11 +92,11 @@ namespace Server.Items
{
if ( tub.MetallicHues ) /* OSI has three metallic tubs now */
{
from.SendGump( new MetallicHuePicker( from, new MetallicHuePicker.MetallicHuePickerCallback( SetTubHue ), tub ) );
from.SendGump( new MetallicHuePicker( from, SetTubHue, tub ) );
}
else if ( tub.CustomHuePicker != null )
{
from.SendGump( new CustomHuePickerGump( from, tub.CustomHuePicker, new CustomHuePickerCallback( SetTubHue ), tub ) );
from.SendGump( new CustomHuePickerGump( from, tub.CustomHuePicker, SetTubHue, tub ) );
}
else
{