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

fixed erroneous commit

Browse source
This commit is contained in:
mark 2007-09-14 05:03:35 +00:00
parent 3a156a177b
commit 8aa1307afe
1 changed files with 79 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

197
Server/Serialization.cs
View file

@ -1,4 +1,3 @@
//07MAR2007 Update for Linux - seirge
/*************************************************************************** /***************************************************************************
* Serialization.cs * Serialization.cs
* ------------------- * -------------------
@ -66,16 +65,10 @@ namespace Server
public abstract Item ReadItem(); public abstract Item ReadItem();
public abstract Mobile ReadMobile(); public abstract Mobile ReadMobile();
public abstract BaseGuild ReadGuild(); public abstract BaseGuild ReadGuild();
#if MONO
public abstract T ReadItemG<T>() where T : Item;
public abstract T ReadMobileG<T>() where T : Mobile;
public abstract T ReadGuildG<T>() where T : BaseGuild;
#else
public abstract T ReadItem<T>() where T : Item; public abstract T ReadItem<T>() where T : Item;
public abstract T ReadMobile<T>() where T : Mobile; public abstract T ReadMobile<T>() where T : Mobile;
public abstract T ReadGuild<T>() where T : BaseGuild; public abstract T ReadGuild<T>() where T : BaseGuild;
#endif
public abstract ArrayList ReadItemList(); public abstract ArrayList ReadItemList();
public abstract ArrayList ReadMobileList(); public abstract ArrayList ReadMobileList();
@ -986,192 +979,161 @@ namespace Server
{ {
return BaseGuild.Find( ReadInt() ); return BaseGuild.Find( ReadInt() );
} }
#if MONO
public override T ReadItemG<T>()
{
return ReadItem() as T;
}
#else
public override T ReadItem<T>() public override T ReadItem<T>()
{ {
return ReadItem() as T; return ReadItem() as T;
} }
#endif
#if MONO
public override T ReadMobileG<T>()
{
return ReadMobile() as T;
}
#else
public override T ReadMobile<T>() public override T ReadMobile<T>()
{ {
return ReadMobile() as T; return ReadMobile() as T;
} }
#endif
#if MONO
public override T ReadGuildG<T>()
{
return ReadGuild() as T;
}
#else
public override T ReadGuild<T>() public override T ReadGuild<T>()
{ {
return ReadGuild() as T; return ReadGuild() as T;
} }
#endif
public override ArrayList ReadItemList() public override ArrayList ReadItemList()
{ {
int count = ReadInt(); int count = ReadInt();
ArrayList list = new ArrayList( count ); if ( count > 0 ) {
ArrayList list = new ArrayList( count );
for( int i = 0; i < count; ++i ) for ( int i = 0; i < count; ++i ) {
{ Item item = ReadItem();
Item item = ReadItem();
if( item != null ) if ( item != null ) {
list.Add( item ); list.Add( item );
}
}
return list;
} else {
return new ArrayList();
} }
return list;
} }
public override ArrayList ReadMobileList() public override ArrayList ReadMobileList()
{ {
int count = ReadInt(); int count = ReadInt();
ArrayList list = new ArrayList( count ); if ( count > 0 ) {
ArrayList list = new ArrayList( count );
for( int i = 0; i < count; ++i ) for ( int i = 0; i < count; ++i ) {
{ Mobile m = ReadMobile();
Mobile m = ReadMobile();
if( m != null ) if ( m != null ) {
list.Add( m ); list.Add( m );
}
}
return list;
} else {
return new ArrayList();
} }
return list;
} }
public override ArrayList ReadGuildList() public override ArrayList ReadGuildList()
{ {
int count = ReadInt(); int count = ReadInt();
ArrayList list = new ArrayList( count ); if ( count > 0 ) {
ArrayList list = new ArrayList( count );
for( int i = 0; i < count; ++i ) for ( int i = 0; i < count; ++i ) {
{ BaseGuild g = ReadGuild();
BaseGuild g = ReadGuild();
if( g != null ) if ( g != null ) {
list.Add( g ); list.Add( g );
}
}
return list;
} else {
return new ArrayList();
} }
return list;
} }
public override List<Item> ReadStrongItemList() public override List<Item> ReadStrongItemList()
{ {
int count = ReadInt(); return ReadStrongItemList<Item>();
List<Item> list = new List<Item>( count );
for( int i = 0; i < count; ++i )
{
Item item = ReadItem();
if( item != null )
list.Add( item );
}
return list;
} }
public override List<T> ReadStrongItemList<T>() public override List<T> ReadStrongItemList<T>()
{ {
int count = ReadInt(); int count = ReadInt();
List<T> list = new List<T>( count ); if ( count > 0 ) {
List<T> list = new List<T>( count );
for( int i = 0; i < count; ++i ) for ( int i = 0; i < count; ++i ) {
{ T item = ReadItem() as T;
T item = ReadItem() as T;
if( item != null ) if ( item != null ) {
list.Add( item ); list.Add( item );
}
}
return list;
} else {
return new List<T>();
} }
return list;
} }
public override List<Mobile> ReadStrongMobileList() public override List<Mobile> ReadStrongMobileList()
{ {
int count = ReadInt(); return ReadStrongMobileList<Mobile>();
List<Mobile> list = new List<Mobile>( count );
for( int i = 0; i < count; ++i )
{
Mobile m = ReadMobile();
if( m != null )
list.Add( m );
}
return list;
} }
public override List<T> ReadStrongMobileList<T>() public override List<T> ReadStrongMobileList<T>()
{ {
int count = ReadInt(); int count = ReadInt();
List<T> list = new List<T>( count ); if ( count > 0 ) {
List<T> list = new List<T>( count );
for( int i = 0; i < count; ++i ) for ( int i = 0; i < count; ++i ) {
{ T m = ReadMobile() as T;
T m = ReadMobile() as T;
if( m != null ) if ( m != null ) {
list.Add( m ); list.Add( m );
}
}
return list;
} else {
return new List<T>();
} }
return list;
} }
public override List<BaseGuild> ReadStrongGuildList() public override List<BaseGuild> ReadStrongGuildList()
{ {
int count = ReadInt(); return ReadStrongGuildList<BaseGuild>();
List<BaseGuild> list = new List<BaseGuild>( count );
for( int i = 0; i < count; ++i )
{
BaseGuild g = ReadGuild();
if( g != null )
list.Add( g );
}
return list;
} }
public override List<T> ReadStrongGuildList<T>() public override List<T> ReadStrongGuildList<T>()
{ {
int count = ReadInt(); int count = ReadInt();
List<T> list = new List<T>( count ); if ( count > 0 ) {
List<T> list = new List<T>( count );
for( int i = 0; i < count; ++i ) for ( int i = 0; i < count; ++i ) {
{ T g = ReadGuild() as T;
T g = ReadGuild() as T;
if( g != null ) if ( g != null ) {
list.Add( g ); list.Add( g );
}
}
return list;
} else {
return new List<T>();
} }
return list;
} }
public override bool End() public override bool End()
@ -1752,5 +1714,4 @@ namespace Server
int SerialIdentity { get; } int SerialIdentity { get; }
void Serialize( GenericWriter writer ); void Serialize( GenericWriter writer );
} }
} }