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

FxCop

Browse source
This commit is contained in:
asayre 2010-10-18 07:06:50 +00:00
parent a90eb17e96
commit 83662f2215
6 changed files with 33 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Scripts/Mobiles/PlayerMobile.cs
View file

@ -104,7 +104,7 @@ namespace Server.Mobiles
private int m_Profession;
private bool m_IsStealthing; // IsStealthing should be moved to Server.Mobiles
private bool m_IgnoreMobiles; // IgnoreMobiles should be moved to Server.Mobiles
private int m_NonAutoreinsuredItems; // number of items that could not be automaitically reinsured because gold in bank was not enough
private int m_NonAutoreinsuredItems; // number of items that could not be automaitically reinsured because gold in bank was not enough
/*
* a value of zero means, that the mobile is not executing the spell. Otherwise,
@ -2070,7 +2070,7 @@ namespace Server.Mobiles
public override bool OnBeforeDeath()
{
m_NonAutoreinsuredItems = 0;
m_NonAutoreinsuredItems = 0;
m_InsuranceCost = 0;
m_InsuranceAward = base.FindMostRecentDamager( false );
@ -2110,14 +2110,14 @@ namespace Server.Mobiles
{
m_InsuranceCost += cost;
item.PayedInsurance = true;
SendLocalizedMessage(1060398, cost.ToString()); // ~1_AMOUNT~ gold has been withdrawn from your bank box.
}
SendLocalizedMessage(1060398, cost.ToString()); // ~1_AMOUNT~ gold has been withdrawn from your bank box.
}
else
{
SendLocalizedMessage( 1061079, "", 0x23 ); // You lack the funds to purchase the insurance
item.PayedInsurance = false;
item.Insured = false;
m_NonAutoreinsuredItems++;
m_NonAutoreinsuredItems++;
}
}
else
@ -2169,12 +2169,12 @@ namespace Server.Mobiles
public override void OnDeath( Container c )
{
if (m_NonAutoreinsuredItems > 0)
{
SendMessage("You do not have the gold to automatically reinsure all your items.");
}
if (m_NonAutoreinsuredItems > 0)
{
SendMessage("You do not have the gold to automatically reinsure all your items.");
}
base.OnDeath(c);
base.OnDeath(c);
HueMod = -1;
NameMod = null;
@ -2493,7 +2493,7 @@ namespace Server.Mobiles
/* Per EA's UO Herald Pub48 (ML):
* ((resist spellsx10)/20 + 10=percentage of damage resisted)
*/
if ( oath == this )
{
amount = (int)(amount * 1.1);
@ -3418,7 +3418,7 @@ namespace Server.Mobiles
if ( context != null && context.Type == typeof( ReaperFormSpell ) )
return Mobile.WalkFoot;
bool running = ( (dir & Direction.Running) != 0 );
bool running = ( (dir & Direction.Running) != 0 );
bool onHorse = ( this.Mount != null );

11
Scripts/Regions/BaseRegion.cs
View file

@ -483,9 +483,9 @@ namespace Server.Regions
{
ReadBoolean( spawning, "excludeFromParent", ref m_ExcludeFromParentSpawns, false );
object zLevel = SpawnZLevel.Lowest;
ReadEnum( spawning, "zLevel", typeof( SpawnZLevel ), ref zLevel, false );
m_SpawnZLevel = (SpawnZLevel) zLevel;
SpawnZLevel zLevel = SpawnZLevel.Lowest;
ReadEnum( spawning, "zLevel", ref zLevel, false );
m_SpawnZLevel = zLevel;
List<SpawnEntry> list = new List<SpawnEntry>();
@ -521,9 +521,8 @@ namespace Server.Regions
if ( ReadPoint3D( homeEl, map, ref home, false ) )
ReadInt32( homeEl, "range", ref range, false );
object oDir = SpawnEntry.InvalidDirection;
ReadEnum( el["direction"], "value" , typeof( Direction ), ref oDir, false );
Direction dir = (Direction) oDir;
Direction dir = SpawnEntry.InvalidDirection;
ReadEnum( el["direction"], "value" , ref dir, false );
SpawnEntry entry = new SpawnEntry( id, this, home, range, dir, def, amount, minSpawnTime, maxSpawnTime );
list.Add( entry );

7
Scripts/Regions/Spawning/SpawnDefinition.cs
View file

@ -66,10 +66,11 @@ namespace Server.Regions
int itemID = 0xE43;
Region.ReadInt32( xml, "itemID", ref itemID, false );
object oLevel = BaseTreasureChest.TreasureLevel.Level2;
Region.ReadEnum( xml, "level", typeof( BaseTreasureChest.TreasureLevel ), ref oLevel, false );
BaseTreasureChest.TreasureLevel level = BaseTreasureChest.TreasureLevel.Level2;
return new SpawnTreasureChest( itemID, (BaseTreasureChest.TreasureLevel) oLevel );
Region.ReadEnum( xml, "level", ref level, false );
return new SpawnTreasureChest( itemID, level );
}
default:
{

3
Server/ExpansionInfo.cs
View file

@ -35,6 +35,7 @@ namespace Server
SA
}
[Flags]
public enum ClientFlags
{
None = 0x00000000,
@ -49,6 +50,7 @@ namespace Server
UOTD = 0x00000100
}
[Flags]
public enum FeatureFlags
{
None = 0x00000000,
@ -82,6 +84,7 @@ namespace Server
ExpansionSA = ExpansionML | SA
}
[Flags]
public enum CharacterListFlags
{
None = 0x00000000,

2
Server/Insensitive.cs
View file

@ -23,7 +23,7 @@ using System.Collections;
namespace Server
{
public class Insensitive
public static class Insensitive
{
private static IComparer m_Comparer = CaseInsensitiveComparer.Default;

15
Server/Region.cs
View file

@ -992,11 +992,11 @@ namespace Server
}
object oMusic = this.DefaultMusic;
MusicName music = this.DefaultMusic;
ReadEnum( xml["music"], "name", typeof( MusicName ), ref oMusic, false );
ReadEnum( xml["music"], "name", ref music, false );
m_Music = (MusicName) oMusic;
m_Music = music;
}
protected static string GetAttribute( XmlElement xml, string attribute, bool mandatory )
@ -1137,12 +1137,12 @@ namespace Server
return true;
}
public static bool ReadEnum( XmlElement xml, string attribute, Type type, ref object value )
public static bool ReadEnum<T>( XmlElement xml, string attribute, ref T value )
{
return ReadEnum( xml, attribute, type, ref value, true );
return ReadEnum( xml, attribute, ref value, true );
}
public static bool ReadEnum( XmlElement xml, string attribute, Type type, ref object value, bool mandatory )
public static bool ReadEnum<T>( XmlElement xml, string attribute, ref T value, bool mandatory )
{
string s = GetAttribute( xml, attribute, mandatory );
@ -1151,7 +1151,8 @@ namespace Server
try
{
value = Enum.Parse( type, s, true );
value = (T)Enum.Parse( typeof( T ), s, true );
//TODO: On .NET 4.0, use Enum.TryParse
}
catch
{