Removes implicit this.
This commit is contained in:
parent
04b4cfe75b
commit
83dcf536d8
533 changed files with 2804 additions and 2806 deletions
|
|
@ -20,7 +20,7 @@ namespace Server.Items
|
|||
|
||||
public override void OnDoubleClick( Mobile from )
|
||||
{
|
||||
if ( this.Parent != null || !this.VerifyMove( from ) )
|
||||
if ( Parent != null || !VerifyMove( from ) )
|
||||
return;
|
||||
|
||||
if ( !from.InRange( this, 2 ) )
|
||||
|
|
@ -29,18 +29,18 @@ namespace Server.Items
|
|||
return;
|
||||
}
|
||||
|
||||
if ( this.ItemID == 0xA57 ) // rolled
|
||||
if ( ItemID == 0xA57 ) // rolled
|
||||
{
|
||||
Direction dir = PlayerMobile.GetDirection4( from.Location, this.Location );
|
||||
Direction dir = PlayerMobile.GetDirection4( from.Location, Location );
|
||||
|
||||
if ( dir == Direction.North || dir == Direction.South )
|
||||
this.ItemID = 0xA55;
|
||||
ItemID = 0xA55;
|
||||
else
|
||||
this.ItemID = 0xA56;
|
||||
ItemID = 0xA56;
|
||||
}
|
||||
else // unrolled
|
||||
{
|
||||
this.ItemID = 0xA57;
|
||||
ItemID = 0xA57;
|
||||
|
||||
if ( !from.HasGump( typeof( LogoutGump ) ) )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ namespace Server.Items
|
|||
{
|
||||
get
|
||||
{
|
||||
switch ( this.ItemID )
|
||||
switch ( ItemID )
|
||||
{
|
||||
case 0xDE3:
|
||||
return CampfireStatus.Burning;
|
||||
|
|
@ -71,24 +71,24 @@ namespace Server.Items
|
|||
}
|
||||
set
|
||||
{
|
||||
if ( this.Status == value )
|
||||
if ( Status == value )
|
||||
return;
|
||||
|
||||
switch ( value )
|
||||
{
|
||||
case CampfireStatus.Burning:
|
||||
this.ItemID = 0xDE3;
|
||||
this.Light = LightType.Circle300;
|
||||
ItemID = 0xDE3;
|
||||
Light = LightType.Circle300;
|
||||
break;
|
||||
|
||||
case CampfireStatus.Extinguishing:
|
||||
this.ItemID = 0xDE9;
|
||||
this.Light = LightType.Circle150;
|
||||
ItemID = 0xDE9;
|
||||
Light = LightType.Circle150;
|
||||
break;
|
||||
|
||||
default:
|
||||
this.ItemID = 0xDEA;
|
||||
this.Light = LightType.ArchedWindowEast;
|
||||
ItemID = 0xDEA;
|
||||
Light = LightType.ArchedWindowEast;
|
||||
ClearEntries();
|
||||
break;
|
||||
}
|
||||
|
|
@ -98,16 +98,16 @@ namespace Server.Items
|
|||
private void OnTick()
|
||||
{
|
||||
DateTime now = DateTime.UtcNow;
|
||||
TimeSpan age = now - this.Created;
|
||||
TimeSpan age = now - Created;
|
||||
|
||||
if ( age >= TimeSpan.FromSeconds( 100.0 ) )
|
||||
this.Delete();
|
||||
Delete();
|
||||
else if ( age >= TimeSpan.FromSeconds( 90.0 ) )
|
||||
this.Status = CampfireStatus.Off;
|
||||
Status = CampfireStatus.Off;
|
||||
else if ( age >= TimeSpan.FromSeconds( 60.0 ) )
|
||||
this.Status = CampfireStatus.Extinguishing;
|
||||
Status = CampfireStatus.Extinguishing;
|
||||
|
||||
if ( this.Status == CampfireStatus.Off || this.Deleted )
|
||||
if ( Status == CampfireStatus.Off || Deleted )
|
||||
return;
|
||||
|
||||
foreach ( CampfireEntry entry in new ArrayList( m_Entries ) )
|
||||
|
|
@ -123,7 +123,7 @@ namespace Server.Items
|
|||
}
|
||||
}
|
||||
|
||||
IPooledEnumerable<NetState> eable = this.GetClientsInRange( SecureRange );
|
||||
IPooledEnumerable<NetState> eable = GetClientsInRange( SecureRange );
|
||||
|
||||
foreach ( NetState state in eable )
|
||||
{
|
||||
|
|
@ -172,7 +172,7 @@ namespace Server.Items
|
|||
|
||||
int version = reader.ReadInt();
|
||||
|
||||
this.Delete();
|
||||
Delete();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -41,10 +41,10 @@ namespace Server.Items
|
|||
|
||||
public override void OnDoubleClick( Mobile from )
|
||||
{
|
||||
if ( !this.VerifyMove( from ) )
|
||||
if ( !VerifyMove( from ) )
|
||||
return;
|
||||
|
||||
if ( !from.InRange( this.GetWorldLocation(), 2 ) )
|
||||
if ( !from.InRange( GetWorldLocation(), 2 ) )
|
||||
{
|
||||
from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1019045 ); // I can't reach that.
|
||||
return;
|
||||
|
|
@ -64,7 +64,7 @@ namespace Server.Items
|
|||
{
|
||||
Consume();
|
||||
|
||||
if ( !this.Deleted && this.Parent == null )
|
||||
if ( !Deleted && Parent == null )
|
||||
from.PlaceInBackpack( this );
|
||||
|
||||
new Campfire().MoveToWorld( fireLocation, from.Map );
|
||||
|
|
@ -76,8 +76,8 @@ namespace Server.Items
|
|||
if ( from.Region.IsPartOf( typeof( DungeonRegion ) ) )
|
||||
return Point3D.Zero;
|
||||
|
||||
if ( this.Parent == null )
|
||||
return this.Location;
|
||||
if ( Parent == null )
|
||||
return Location;
|
||||
|
||||
ArrayList list = new ArrayList( 4 );
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue