This commit is contained in:
mark 2009-02-19 08:27:47 +00:00
parent e17e4c9304
commit 49b5e96850
9 changed files with 52 additions and 27 deletions

View file

@ -1200,10 +1200,13 @@ namespace Server.Gumps
{
if ( isOwner && m_House.MovingCrate == null && m_House.InternalizedVendors.Count == 0 )
{
if( !Guilds.Guild.NewGuildSystem && m_House.FindGuildstone() != null )
if( !Guilds.Guild.NewGuildSystem && m_House.FindGuildstone() != null ) {
from.SendLocalizedMessage( 501389 ); // You cannot redeed a house with a guildstone inside.
else
}
else {
from.CloseGump( typeof( HouseDemolishGump ) );
from.SendGump( new HouseDemolishGump( from, m_House ) );
}
}
break;

View file

@ -156,7 +156,6 @@ namespace Server.Gumps
}
}
public class NewPolymorphGump : Gump
{
private static readonly PolymorphEntry[] m_Entries = new PolymorphEntry[]
@ -181,7 +180,6 @@ namespace Server.Gumps
PolymorphEntry.Daemon
};
private Mobile m_Caster;
private Item m_Scroll;

View file

@ -48,6 +48,11 @@ namespace Server.Gumps
{
}
public ResurrectGump( Mobile owner, Mobile healer, ResurrectMessage msg )
: this( owner, healer, msg, false )
{
}
public ResurrectGump( Mobile owner, Mobile healer, ResurrectMessage msg, bool fromSacrifice )
: this( owner, healer, msg, fromSacrifice, 0.0 )
{
@ -138,6 +143,8 @@ namespace Server.Gumps
{
Mobile from = state.Mobile;
from.CloseGump( typeof( ResurrectGump ) );
if( info.ButtonID == 1 || info.ButtonID == 2 )
{
if( from.Map == null || !from.Map.CanFit( from.Location, 16, false, false ) )
@ -241,4 +248,4 @@ namespace Server.Gumps
}
}
}
}
}