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

Replaces types with built-in types.

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 13:22:16 -07:00
parent fee83ce560
commit 22ab83ea9e
98 changed files with 248 additions and 248 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Scripts/Gumps/AdminGump.cs
View file

@ -2323,7 +2323,7 @@ namespace Server.Gumps
break;
if ( rads.Count > 0 )
from.SendGump( new WarningGump( 1060635, 30720, String.Format( "You are about to <em><basefont color=red>permanently delete</basefont></em> {0} marked account{1}. Likewise, all characters on the account{1} will be deleted, including equipped, inventory, and banked items. Any houses tied to the account{1} will be demolished.<br><br>Do you wish to continue?", rads.Count, rads.Count == 1 ? "" : "s" ), 0xFFC000, 420, 280, new WarningGumpCallback( Marked_Callback ), new object[]{ false, list, rads, m_ListPage } ) );
from.SendGump( new WarningGump( 1060635, 30720, string.Format( "You are about to <em><basefont color=red>permanently delete</basefont></em> {0} marked account{1}. Likewise, all characters on the account{1} will be deleted, including equipped, inventory, and banked items. Any houses tied to the account{1} will be demolished.<br><br>Do you wish to continue?", rads.Count, rads.Count == 1 ? "" : "s" ), 0xFFC000, 420, 280, new WarningGumpCallback( Marked_Callback ), new object[]{ false, list, rads, m_ListPage } ) );
else
from.SendGump( new NoticeGump( 1060637, 30720, "You have not yet marked any accounts. Place a check mark next to the accounts you wish to ban and then try again.", 0xFFC000, 420, 280, new NoticeGumpCallback( ResendGump_Callback ), new object[]{ list, rads, m_ListPage } ) );

2
Scripts/Gumps/Guilds/New Guild System/GuildInfoGump.cs
View file

@ -60,7 +60,7 @@ namespace Server.Guilds
string s = guild.Charter;
if ( String.IsNullOrEmpty( s ) )
if ( string.IsNullOrEmpty( s ) )
s = "The guild leader has not yet set the guild charter.";
AddHtml( 65, 216, 480, 80, s, true, true );

2
Scripts/Gumps/PlayerVendorGumps.cs
View file

@ -22,7 +22,7 @@ namespace Server.Gumps
AddHtmlLocalized( 125, 20, 250, 24, 1019070, false, false ); // You have agreed to purchase:
if ( !String.IsNullOrEmpty( vi.Description ) )
if ( !string.IsNullOrEmpty( vi.Description ) )
AddLabel( 125, 45, 0, vi.Description );
else
AddHtmlLocalized( 125, 45, 250, 24, 1019072, false, false ); // an item without a description

30
Scripts/Gumps/Props/PropsGump.cs
View file

@ -406,8 +406,8 @@ namespace Server.Gumps
private static Type typeofTimeSpan = typeof( TimeSpan );
private static Type typeofCustomEnum = typeof( CustomEnumAttribute );
private static Type typeofEnum = typeof( Enum );
private static Type typeofBool = typeof( Boolean );
private static Type typeofString = typeof( String );
private static Type typeofBool = typeof( bool );
private static Type typeofString = typeof( string );
private static Type typeofText = typeof( TextDefinition );
private static Type typeofPoison = typeof( Poison );
private static Type typeofMap = typeof( Map );
@ -416,19 +416,19 @@ namespace Server.Gumps
private static Type typeofNoSort = typeof( NoSortAttribute );
private static Type[] typeofReal = {
typeof( Single ),
typeof( Double )
typeof( float ),
typeof( double )
};
private static Type[] typeofNumeric = {
typeof( Byte ),
typeof( Int16 ),
typeof( Int32 ),
typeof( Int64 ),
typeof( SByte ),
typeof( UInt16 ),
typeof( UInt32 ),
typeof( UInt64 )
typeof( byte ),
typeof( short ),
typeof( int ),
typeof( long ),
typeof( sbyte ),
typeof( ushort ),
typeof( uint ),
typeof( ulong )
};
private string ValueToString( PropertyInfo prop )
@ -484,7 +484,7 @@ namespace Server.Gumps
}
if ( o is byte || o is sbyte || o is short || o is ushort || o is int || o is uint || o is long || o is ulong )
{
return String.Format( "{0} (0x{0:X})", o );
return string.Format( "{0} (0x{0:X})", o );
}
if ( o is Mobile mobile )
{
@ -668,7 +668,7 @@ namespace Server.Gumps
}
if ( o is byte || o is sbyte || o is short || o is ushort || o is int || o is uint || o is long || o is ulong )
{
return String.Format( "{0} (0x{0:X})", o );
return string.Format( "{0} (0x{0:X})", o );
}
if ( o is Mobile mobile )
{
@ -722,7 +722,7 @@ namespace Server.Gumps
m_Start = start;
}
private static Type typeofObject = typeof( Object );
private static Type typeofObject = typeof( object );
private int GetDistance( Type type )
{