Fixes code according to modern code style. Fixes a few expression bugs.
This commit is contained in:
parent
89eea25e5f
commit
970fd563b2
3324 changed files with 441118 additions and 433755 deletions
|
|
@ -1,206 +1,209 @@
|
|||
using System.IO;
|
||||
using Server.Network;
|
||||
|
||||
namespace Server.Engines.Mahjong
|
||||
{
|
||||
public sealed class MahjongJoinGame : Packet
|
||||
{
|
||||
public MahjongJoinGame( MahjongGame game ) : base( 0xDA )
|
||||
{
|
||||
EnsureCapacity( 9 );
|
||||
public sealed class MahjongJoinGame : Packet
|
||||
{
|
||||
public MahjongJoinGame(MahjongGame game) : base(0xDA)
|
||||
{
|
||||
EnsureCapacity(9);
|
||||
|
||||
m_Stream.Write( (int) game.Serial );
|
||||
m_Stream.Write( (byte) 0 );
|
||||
m_Stream.Write( (byte) 0x19 );
|
||||
}
|
||||
}
|
||||
m_Stream.Write(game.Serial);
|
||||
m_Stream.Write((byte)0);
|
||||
m_Stream.Write((byte)0x19);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class MahjongPlayersInfo : Packet
|
||||
{
|
||||
public MahjongPlayersInfo( MahjongGame game, Mobile to ) : base( 0xDA )
|
||||
{
|
||||
MahjongPlayers players = game.Players;
|
||||
public sealed class MahjongPlayersInfo : Packet
|
||||
{
|
||||
public MahjongPlayersInfo(MahjongGame game, Mobile to) : base(0xDA)
|
||||
{
|
||||
MahjongPlayers players = game.Players;
|
||||
|
||||
EnsureCapacity( 11 + 45 * players.Seats );
|
||||
EnsureCapacity(11 + 45 * players.Seats);
|
||||
|
||||
m_Stream.Write( (int) game.Serial );
|
||||
m_Stream.Write( (byte) 0 );
|
||||
m_Stream.Write( (byte) 0x2 );
|
||||
m_Stream.Write(game.Serial);
|
||||
m_Stream.Write((byte)0);
|
||||
m_Stream.Write((byte)0x2);
|
||||
|
||||
m_Stream.Write( (byte) 0 );
|
||||
m_Stream.Write( (byte) players.Seats );
|
||||
m_Stream.Write((byte)0);
|
||||
m_Stream.Write((byte)players.Seats);
|
||||
|
||||
int n = 0;
|
||||
for ( int i = 0; i < players.Seats; i++ )
|
||||
{
|
||||
Mobile mobile = players.GetPlayer( i );
|
||||
int n = 0;
|
||||
for (int i = 0; i < players.Seats; i++)
|
||||
{
|
||||
Mobile mobile = players.GetPlayer(i);
|
||||
|
||||
if ( mobile != null )
|
||||
{
|
||||
m_Stream.Write( (int) mobile.Serial );
|
||||
m_Stream.Write( players.DealerPosition == i ? (byte) 0x1 : (byte) 0x2 );
|
||||
m_Stream.Write( (byte) i );
|
||||
if (mobile != null)
|
||||
{
|
||||
m_Stream.Write(mobile.Serial);
|
||||
m_Stream.Write(players.DealerPosition == i ? (byte)0x1 : (byte)0x2);
|
||||
m_Stream.Write((byte)i);
|
||||
|
||||
if ( game.ShowScores || mobile == to )
|
||||
m_Stream.Write( (int) players.GetScore( i ) );
|
||||
else
|
||||
m_Stream.Write( (int) 0 );
|
||||
if (game.ShowScores || mobile == to)
|
||||
m_Stream.Write(players.GetScore(i));
|
||||
else
|
||||
m_Stream.Write(0);
|
||||
|
||||
m_Stream.Write( (short) 0 );
|
||||
m_Stream.Write( (byte) 0 );
|
||||
m_Stream.Write((short)0);
|
||||
m_Stream.Write((byte)0);
|
||||
|
||||
m_Stream.Write( players.IsPublic( i ) );
|
||||
m_Stream.Write(players.IsPublic(i));
|
||||
|
||||
m_Stream.WriteAsciiFixed( mobile.Name, 30 );
|
||||
m_Stream.Write( !players.IsInGamePlayer( i ) );
|
||||
m_Stream.WriteAsciiFixed(mobile.Name, 30);
|
||||
m_Stream.Write(!players.IsInGamePlayer(i));
|
||||
|
||||
n++;
|
||||
}
|
||||
else if ( game.ShowScores )
|
||||
{
|
||||
m_Stream.Write( (int) 0 );
|
||||
m_Stream.Write( (byte) 0x2 );
|
||||
m_Stream.Write( (byte) i );
|
||||
n++;
|
||||
}
|
||||
else if (game.ShowScores)
|
||||
{
|
||||
m_Stream.Write(0);
|
||||
m_Stream.Write((byte)0x2);
|
||||
m_Stream.Write((byte)i);
|
||||
|
||||
m_Stream.Write( (int) players.GetScore( i ) );
|
||||
m_Stream.Write(players.GetScore(i));
|
||||
|
||||
m_Stream.Write( (short) 0 );
|
||||
m_Stream.Write( (byte) 0 );
|
||||
m_Stream.Write((short)0);
|
||||
m_Stream.Write((byte)0);
|
||||
|
||||
m_Stream.Write( players.IsPublic( i ) );
|
||||
m_Stream.Write(players.IsPublic(i));
|
||||
|
||||
m_Stream.WriteAsciiFixed( "", 30 );
|
||||
m_Stream.Write( true );
|
||||
m_Stream.WriteAsciiFixed("", 30);
|
||||
m_Stream.Write(true);
|
||||
|
||||
n++;
|
||||
}
|
||||
}
|
||||
n++;
|
||||
}
|
||||
}
|
||||
|
||||
if ( n != players.Seats )
|
||||
{
|
||||
m_Stream.Seek( 10, System.IO.SeekOrigin.Begin );
|
||||
m_Stream.Write( (byte) n );
|
||||
}
|
||||
}
|
||||
}
|
||||
if (n != players.Seats)
|
||||
{
|
||||
m_Stream.Seek(10, SeekOrigin.Begin);
|
||||
m_Stream.Write((byte)n);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class MahjongGeneralInfo : Packet
|
||||
{
|
||||
public MahjongGeneralInfo( MahjongGame game ) : base( 0xDA )
|
||||
{
|
||||
EnsureCapacity( 13 );
|
||||
public sealed class MahjongGeneralInfo : Packet
|
||||
{
|
||||
public MahjongGeneralInfo(MahjongGame game) : base(0xDA)
|
||||
{
|
||||
EnsureCapacity(13);
|
||||
|
||||
m_Stream.Write( (int) game.Serial );
|
||||
m_Stream.Write( (byte) 0 );
|
||||
m_Stream.Write( (byte) 0x5 );
|
||||
m_Stream.Write(game.Serial);
|
||||
m_Stream.Write((byte)0);
|
||||
m_Stream.Write((byte)0x5);
|
||||
|
||||
m_Stream.Write( (short) 0 );
|
||||
m_Stream.Write( (byte) 0 );
|
||||
m_Stream.Write((short)0);
|
||||
m_Stream.Write((byte)0);
|
||||
|
||||
m_Stream.Write( (byte) ((game.ShowScores ? 0x1 : 0x0) | (game.SpectatorVision ? 0x2 : 0x0)) );
|
||||
m_Stream.Write((byte)((game.ShowScores ? 0x1 : 0x0) | (game.SpectatorVision ? 0x2 : 0x0)));
|
||||
|
||||
m_Stream.Write( (byte) game.Dices.First );
|
||||
m_Stream.Write( (byte) game.Dices.Second );
|
||||
m_Stream.Write((byte)game.Dices.First);
|
||||
m_Stream.Write((byte)game.Dices.Second);
|
||||
|
||||
m_Stream.Write( (byte) game.DealerIndicator.Wind );
|
||||
m_Stream.Write( (short) game.DealerIndicator.Position.Y );
|
||||
m_Stream.Write( (short) game.DealerIndicator.Position.X );
|
||||
m_Stream.Write( (byte) game.DealerIndicator.Direction );
|
||||
m_Stream.Write((byte)game.DealerIndicator.Wind);
|
||||
m_Stream.Write((short)game.DealerIndicator.Position.Y);
|
||||
m_Stream.Write((short)game.DealerIndicator.Position.X);
|
||||
m_Stream.Write((byte)game.DealerIndicator.Direction);
|
||||
|
||||
m_Stream.Write( (short) game.WallBreakIndicator.Position.Y );
|
||||
m_Stream.Write( (short) game.WallBreakIndicator.Position.X );
|
||||
}
|
||||
}
|
||||
m_Stream.Write((short)game.WallBreakIndicator.Position.Y);
|
||||
m_Stream.Write((short)game.WallBreakIndicator.Position.X);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class MahjongTilesInfo : Packet
|
||||
{
|
||||
public MahjongTilesInfo( MahjongGame game, Mobile to ) : base( 0xDA )
|
||||
{
|
||||
MahjongTile[] tiles = game.Tiles;
|
||||
MahjongPlayers players = game.Players;
|
||||
public sealed class MahjongTilesInfo : Packet
|
||||
{
|
||||
public MahjongTilesInfo(MahjongGame game, Mobile to) : base(0xDA)
|
||||
{
|
||||
MahjongTile[] tiles = game.Tiles;
|
||||
MahjongPlayers players = game.Players;
|
||||
|
||||
EnsureCapacity( 11 + 9 * tiles.Length );
|
||||
EnsureCapacity(11 + 9 * tiles.Length);
|
||||
|
||||
m_Stream.Write( (int) game.Serial );
|
||||
m_Stream.Write( (byte) 0 );
|
||||
m_Stream.Write( (byte) 0x4 );
|
||||
m_Stream.Write(game.Serial);
|
||||
m_Stream.Write((byte)0);
|
||||
m_Stream.Write((byte)0x4);
|
||||
|
||||
m_Stream.Write( (short) tiles.Length );
|
||||
m_Stream.Write((short)tiles.Length);
|
||||
|
||||
foreach ( MahjongTile tile in tiles )
|
||||
{
|
||||
m_Stream.Write( (byte) tile.Number );
|
||||
foreach (MahjongTile tile in tiles)
|
||||
{
|
||||
m_Stream.Write((byte)tile.Number);
|
||||
|
||||
if ( tile.Flipped )
|
||||
{
|
||||
int hand = tile.Dimensions.GetHandArea();
|
||||
if (tile.Flipped)
|
||||
{
|
||||
int hand = tile.Dimensions.GetHandArea();
|
||||
|
||||
if ( hand < 0 || players.IsPublic( hand ) || players.GetPlayer( hand ) == to || (game.SpectatorVision && players.IsSpectator( to )) )
|
||||
m_Stream.Write( (byte)tile.Value );
|
||||
else
|
||||
m_Stream.Write( (byte) 0 );
|
||||
}
|
||||
else
|
||||
{
|
||||
m_Stream.Write( (byte) 0 );
|
||||
}
|
||||
if (hand < 0 || players.IsPublic(hand) || players.GetPlayer(hand) == to ||
|
||||
game.SpectatorVision && players.IsSpectator(to))
|
||||
m_Stream.Write((byte)tile.Value);
|
||||
else
|
||||
m_Stream.Write((byte)0);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_Stream.Write((byte)0);
|
||||
}
|
||||
|
||||
m_Stream.Write( (short) tile.Position.Y );
|
||||
m_Stream.Write( (short) tile.Position.X );
|
||||
m_Stream.Write( (byte) tile.StackLevel );
|
||||
m_Stream.Write( (byte) tile.Direction );
|
||||
m_Stream.Write((short)tile.Position.Y);
|
||||
m_Stream.Write((short)tile.Position.X);
|
||||
m_Stream.Write((byte)tile.StackLevel);
|
||||
m_Stream.Write((byte)tile.Direction);
|
||||
|
||||
m_Stream.Write( tile.Flipped ? (byte) 0x10 : (byte) 0x0 );
|
||||
}
|
||||
}
|
||||
}
|
||||
m_Stream.Write(tile.Flipped ? (byte)0x10 : (byte)0x0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class MahjongTileInfo : Packet
|
||||
{
|
||||
public MahjongTileInfo( MahjongTile tile, Mobile to ) : base( 0xDA )
|
||||
{
|
||||
MahjongGame game = tile.Game;
|
||||
MahjongPlayers players = game.Players;
|
||||
public sealed class MahjongTileInfo : Packet
|
||||
{
|
||||
public MahjongTileInfo(MahjongTile tile, Mobile to) : base(0xDA)
|
||||
{
|
||||
MahjongGame game = tile.Game;
|
||||
MahjongPlayers players = game.Players;
|
||||
|
||||
EnsureCapacity( 18 );
|
||||
EnsureCapacity(18);
|
||||
|
||||
m_Stream.Write( (int) tile.Game.Serial );
|
||||
m_Stream.Write( (byte) 0 );
|
||||
m_Stream.Write( (byte) 0x3 );
|
||||
m_Stream.Write(tile.Game.Serial);
|
||||
m_Stream.Write((byte)0);
|
||||
m_Stream.Write((byte)0x3);
|
||||
|
||||
m_Stream.Write( (byte) tile.Number );
|
||||
m_Stream.Write((byte)tile.Number);
|
||||
|
||||
if ( tile.Flipped )
|
||||
{
|
||||
int hand = tile.Dimensions.GetHandArea();
|
||||
if (tile.Flipped)
|
||||
{
|
||||
int hand = tile.Dimensions.GetHandArea();
|
||||
|
||||
if ( hand < 0 || players.IsPublic( hand ) || players.GetPlayer( hand ) == to || (game.SpectatorVision && players.IsSpectator( to )) )
|
||||
m_Stream.Write( (byte)tile.Value );
|
||||
else
|
||||
m_Stream.Write( (byte) 0 );
|
||||
}
|
||||
else
|
||||
{
|
||||
m_Stream.Write( (byte) 0 );
|
||||
}
|
||||
if (hand < 0 || players.IsPublic(hand) || players.GetPlayer(hand) == to ||
|
||||
game.SpectatorVision && players.IsSpectator(to))
|
||||
m_Stream.Write((byte)tile.Value);
|
||||
else
|
||||
m_Stream.Write((byte)0);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_Stream.Write((byte)0);
|
||||
}
|
||||
|
||||
m_Stream.Write( (short) tile.Position.Y );
|
||||
m_Stream.Write( (short) tile.Position.X );
|
||||
m_Stream.Write( (byte) tile.StackLevel );
|
||||
m_Stream.Write( (byte) tile.Direction );
|
||||
m_Stream.Write((short)tile.Position.Y);
|
||||
m_Stream.Write((short)tile.Position.X);
|
||||
m_Stream.Write((byte)tile.StackLevel);
|
||||
m_Stream.Write((byte)tile.Direction);
|
||||
|
||||
m_Stream.Write( tile.Flipped ? (byte) 0x10 : (byte) 0x0 );
|
||||
}
|
||||
}
|
||||
m_Stream.Write(tile.Flipped ? (byte)0x10 : (byte)0x0);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class MahjongRelieve : Packet
|
||||
{
|
||||
public MahjongRelieve( MahjongGame game ) : base( 0xDA )
|
||||
{
|
||||
EnsureCapacity( 9 );
|
||||
public sealed class MahjongRelieve : Packet
|
||||
{
|
||||
public MahjongRelieve(MahjongGame game) : base(0xDA)
|
||||
{
|
||||
EnsureCapacity(9);
|
||||
|
||||
m_Stream.Write( (int) game.Serial );
|
||||
m_Stream.Write( (byte) 0 );
|
||||
m_Stream.Write( (byte) 0x1A );
|
||||
}
|
||||
}
|
||||
m_Stream.Write(game.Serial);
|
||||
m_Stream.Write((byte)0);
|
||||
m_Stream.Write((byte)0x1A);
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue