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

Browse source
This commit is contained in:
asayre 2006-11-16 07:21:08 +00:00
parent f74af73c5a
commit c6d88e4bd8
2 changed files with 34 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

91
Scripts/Commands/Docs.cs
View file

@ -268,21 +268,6 @@ namespace Server.Commands
{ "System.Char", "<font color=\"blue\">char</font>" }, { "System.Char", "<font color=\"blue\">char</font>" },
{ "System.Void", "<font color=\"blue\">void</font>" }, { "System.Void", "<font color=\"blue\">void</font>" },
}; };
// For stuff we don't want to links to
private static string[] m_DontLink = new string[]
{
"List",
"Stack",
"Queue",
"Dictionary",
"LinkedList",
"SortedList",
"SortedDictionary",
"IComparable",
"IComparer",
"ICloneable",
"Type"
};
private static int m_AliasLength = m_Aliases.GetLength( 0 ); private static int m_AliasLength = m_Aliases.GetLength( 0 );
@ -2154,6 +2139,7 @@ namespace Server.Commands
} }
} }
#region Write[...]
private static void WriteEnum( TypeInfo info, StreamWriter typeHtml ) private static void WriteEnum( TypeInfo info, StreamWriter typeHtml )
{ {
Type type = info.m_Type; Type type = info.m_Type;
@ -2424,46 +2410,7 @@ namespace Server.Commands
html.WriteLine( ")<br>" ); html.WriteLine( ")<br>" );
} }
#endregion
/*
public static string GetGenericTypeName( Type type )
{
return GetGenericTypeName( type, "&lt;", "&gt;" );
}
public static string GetGenericTypeName( Type type, string leftGenericBracket, string rightGenericBracket )
{
string name = type.Name;
if( type.IsGenericType )
{
int index = name.IndexOf( '`' );
if( index > 0 )
{
StringBuilder sb = new StringBuilder( name.Substring( 0, index ) );
sb.Append( leftGenericBracket );
Type[] typeArguments = type.GetGenericArguments();
for( int i = 0; i < typeArguments.Length; i++ )
{
if( i != 0 )
sb.Append( ',' );
sb.Append( typeArguments[i].Name );
}
sb.Append( rightGenericBracket );
name = sb.ToString();
}
}
return name;
}
*/
public static void FormatGeneric( Type type, ref string typeName, ref string fileName, ref string linkName ) public static void FormatGeneric( Type type, ref string typeName, ref string fileName, ref string linkName )
{ {
@ -2481,7 +2428,7 @@ namespace Server.Commands
StringBuilder nameBuilder = new StringBuilder( rootType ); StringBuilder nameBuilder = new StringBuilder( rootType );
StringBuilder fnamBuilder = new StringBuilder( "docs/types/" + Docs.SanitizeType( rootType ) ); StringBuilder fnamBuilder = new StringBuilder( "docs/types/" + Docs.SanitizeType( rootType ) );
StringBuilder linkBuilder; StringBuilder linkBuilder;
if( DontLink( rootType ) ) if( DontLink( type ) )//if( DontLink( rootType ) )
linkBuilder = new StringBuilder( "<font color=\"blue\">" + rootType + "</font>" ); linkBuilder = new StringBuilder( "<font color=\"blue\">" + rootType + "</font>" );
else else
linkBuilder = new StringBuilder( "<a href=\"" + "@directory@" + rootType + "-T-.html\">" + rootType + "</a>" ); linkBuilder = new StringBuilder( "<a href=\"" + "@directory@" + rootType + "-T-.html\">" + rootType + "</a>" );
@ -2506,7 +2453,7 @@ namespace Server.Commands
nameBuilder.Append( sanitizedName ); nameBuilder.Append( sanitizedName );
fnamBuilder.Append( "T" ); fnamBuilder.Append( "T" );
if( DontLink( typeArguments[i].Name ) ) if( DontLink( typeArguments[i] ) )//if( DontLink( typeArguments[i].Name ) )
linkBuilder.Append( "<font color=\"blue\">" + aliasedName + "</font>" ); linkBuilder.Append( "<font color=\"blue\">" + aliasedName + "</font>" );
else else
linkBuilder.Append( "<a href=\"" + "@directory@" + aliasedName + ".html\">" + aliasedName + "</a>" ); linkBuilder.Append( "<a href=\"" + "@directory@" + aliasedName + ".html\">" + aliasedName + "</a>" );
@ -2529,7 +2476,7 @@ namespace Server.Commands
if( link == null ) if( link == null )
{ {
if( DontLink( type.Name ) ) if( DontLink( type ) ) //if( DontLink( type.Name ) )
linkName = "<font color=\"blue\">" + Docs.SanitizeType( type.Name ) + "</font>"; linkName = "<font color=\"blue\">" + Docs.SanitizeType( type.Name ) + "</font>";
else else
linkName = "<a href=\"" + "@directory@" + Docs.SanitizeType( type.Name ) + ".html\">" + Docs.SanitizeType( type.Name ) + "</a>"; linkName = "<a href=\"" + "@directory@" + Docs.SanitizeType( type.Name ) + ".html\">" + Docs.SanitizeType( type.Name ) + "</a>";
@ -2562,12 +2509,40 @@ namespace Server.Commands
return name; return name;
} }
/*
// For stuff we don't want to links to
private static string[] m_DontLink = new string[]
{
"List",
"Stack",
"Queue",
"Dictionary",
"LinkedList",
"SortedList",
"SortedDictionary",
"IComparable",
"IComparer",
"ICloneable",
"Type"
};
public static bool DontLink( string name ) public static bool DontLink( string name )
{ {
foreach( string dontLink in m_DontLink ) foreach( string dontLink in m_DontLink )
if( dontLink == name ) return true; if( dontLink == name ) return true;
return false; return false;
} }
*/
public static bool DontLink( Type type )
{
if( type.Namespace.StartsWith( "Server" ) )
return false;
if( m_Namespaces == null )
return false; //sanity
return !m_Namespaces.ContainsKey( type.Namespace );
}
} }
#region BodyEntry & BodyType #region BodyEntry & BodyType

2
Scripts/Misc/CharacterCreation.cs
View file

@ -889,7 +889,7 @@ namespace Server.Misc
{ {
name = name.Trim(); name = name.Trim();
if ( !NameVerification.Validate( name, 2, 16, true, true, true, 1, NameVerification.SpaceDashPeriodQuote ) ) if ( !NameVerification.Validate( name, 2, 16, true, false, true, 1, NameVerification.SpaceDashPeriodQuote ) )
name = "Generic Player"; name = "Generic Player";
m.Name = name; m.Name = name;