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

Browse source
This commit is contained in:
mark 2010-12-06 07:28:42 +00:00
parent d444b9ba5c
commit bb4fad05ec
5 changed files with 15 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Scripts/Multis/HouseFoundation.cs
View file

@ -209,7 +209,7 @@ namespace Server.Multis
for( int i = 0; i < list.Length; ++i )
{
MultiTileEntry mte = list[i];
int itemID = mte.m_ItemID & 0x3FFF;
int itemID = mte.m_ItemID;
if( itemID >= 0x181D && itemID < 0x1829 )
{
@ -1094,7 +1094,6 @@ namespace Server.Multis
public static bool IsStairBlock( int id )
{
id &= 0x3FFF;
int delta = -1;
for( int i = 0; delta < 0 && i < m_BlockIDs.Length; ++i )
@ -1108,7 +1107,6 @@ namespace Server.Multis
public static bool IsStair( int id, ref int dir )
{
//dir n=0 w=1 s=2 e=3
id &= 0x3FFF;
int delta = -4;
for( int i = 0; delta < -3 && i < m_StairSeqs.Length; ++i )
@ -1352,7 +1350,7 @@ namespace Server.Multis
{
MultiTileEntry entry = stairs.List[i];
if( (entry.m_ItemID & 0x3FFF) != 1 )
if( entry.m_ItemID != 1 )
mcl.Add( entry.m_ItemID, x + entry.m_OffsetX, y + entry.m_OffsetY, z + entry.m_OffsetZ );
}
@ -1862,8 +1860,6 @@ namespace Server.Multis
public static bool IsFixture( int itemID )
{
itemID &= 0x3FFF;
if( itemID >= 0x675 && itemID < 0x6F5 )
return true;
else if( itemID >= 0x314 && itemID < 0x364 )

6
Scripts/Multis/HousePlacementTool.cs
View file

@ -467,7 +467,7 @@ namespace Server.Items
{
MultiTileEntry entry = mcl.List[i];
int itemID = entry.m_ItemID & 0x3FFF;
int itemID = entry.m_ItemID;
if ( itemID >= 0xBA3 && itemID <= 0xC0E )
{
@ -563,7 +563,7 @@ namespace Server.Items
{
HousePlacementEntry e = (HousePlacementEntry)list[i];
if ( e.m_MultiID == (house.ItemID & 0x3FFF) )
if ( e.m_MultiID == house.ItemID )
return e;
}
}
@ -571,7 +571,7 @@ namespace Server.Items
{
Hashtable table = (Hashtable)obj;
obj = table[house.ItemID & 0x3FFF];
obj = table[house.ItemID];
if ( obj is HousePlacementEntry )
return (HousePlacementEntry)obj;

2
Scripts/Multis/PreviewHouse.cs
View file

@ -23,7 +23,7 @@ namespace Server.Multis
if ( entry.m_Flags == 0 )
{
Item item = new Static( entry.m_ItemID & 0x3FFF );
Item item = new Static( entry.m_ItemID );
item.MoveToWorld( new Point3D( X + entry.m_OffsetX, Y + entry.m_OffsetY, Z + entry.m_OffsetZ ), Map );