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

massive branch sync

Browse source
This commit is contained in:
mark 2010-04-25 06:09:43 +00:00
parent 489bbabe93
commit b3e8ec0a08
192 changed files with 1249 additions and 1124 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleController.cs
View file

@ -101,7 +101,7 @@ namespace Server.Engines.Doom
m_Teles = new List<Item>();
for (; i<15; i++)
m_Teles.Add( AddLeverPuzzlePart( TA[i], new LampRoomTelePorter( TA[++i] )));
m_Teles.Add( AddLeverPuzzlePart( TA[i], new LampRoomTeleporter( TA[++i] )));
m_Statues = new List<Item>();
for (; i<19; i++)
@ -266,7 +266,7 @@ namespace Server.Engines.Doom
/* if one bit in each of the four nibbles is set, this is false */
if( (TheirKey=(ushort)(code|(TheirKey<<=4))) < 4095 )
if( (TheirKey=(ushort)(code|(TheirKey<<=4))) < 0x0FFF )
{
l_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 30.0 ), new TimerCallback( ResetPuzzle ));
return;

8
Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleItems.cs
View file

@ -152,9 +152,11 @@ namespace Server.Engines.Doom
m_Controller = reader.ReadItem() as LeverPuzzleController;
}
}
public class LampRoomTelePorter : Item
[TypeAlias( "Server.Engines.Doom.LampRoomTelePorter" )]
public class LampRoomTeleporter : Item
{
public LampRoomTelePorter( int[] dat )
public LampRoomTeleporter( int[] dat )
{
Hue = dat[1];
ItemID = dat[0];
@ -180,7 +182,7 @@ namespace Server.Engines.Doom
return true;
}
public LampRoomTelePorter( Serial serial ) : base( serial )
public LampRoomTeleporter( Serial serial ) : base( serial )
{
}
public override void Serialize( GenericWriter writer )