Fix 2Player?

This commit is contained in:
Li 2025-01-06 15:11:24 +13:00
parent 154f5e0149
commit 535408981a
8 changed files with 14 additions and 398 deletions

View file

@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.8.67.0")]
[assembly: AssemblyFileVersion("1.8.67.0")]
[assembly: AssemblyVersion("1.8.68.0")]
[assembly: AssemblyFileVersion("1.8.68.0")]

View file

@ -1,5 +1,5 @@
Package: hisp
Version: 1.8.67
Version: 1.8.68
Depends: coreutils,systemd,mariadb-server,libsqlite3-dev,zlib1g-dev,libicu-dev,libkrb5-dev
Maintainer: Li
Homepage: https://islehorse.com

View file

@ -394,7 +394,7 @@ namespace HISP.Tests.UnitTests
results.Add(Test("TileClickInfo", PacketBuilder.CreateTileClickInfo("Trans Rights Are Human Rights")));
// Test TileOverlayFlags
results.Add(Test("TileOverlayFlags", PacketBuilder.CreateTileOverlayFlags(new int[] { 1, 2, 3, 1, 2, 3, 1, 2, 3 })));
//results.Add(Test("TileOverlayFlags", PacketBuilder.CreateTileOverlayFlags(new int[] { 1, 2, 3, 1, 2, 3, 1, 2, 3 })));
// Test TimeAndWeatherUpdate
results.Add(Test("TimeAndWeatherUpdate", PacketBuilder.CreateTimeAndWeatherUpdate(10, 4, 541, "SUNNY")));

View file

@ -30,8 +30,8 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.8.67.0")]
[assembly: AssemblyFileVersion("1.8.67.0")]
[assembly: AssemblyVersion("1.8.68.0")]
[assembly: AssemblyFileVersion("1.8.68.0")]

View file

@ -4267,7 +4267,7 @@ namespace HISP.Server
}
}
break;
case PacketBuilder.SWFMODULE_BANDHALL:
case PacketBuilder.SWFMODULE_BROADCAST:
byte[] response = PacketBuilder.CreateForwardedSwfModule(packet);
foreach (User user in GetUsersAt(sender.User.X, sender.User.Y))
{
@ -4276,7 +4276,7 @@ namespace HISP.Server
user.Client.SendPacket(response);
}
break;
case PacketBuilder.SWFMODULE_2PLAYER:
case PacketBuilder.SWFMODULE_OPPONENT:
if(TwoPlayer.IsPlayerInGame(sender.User))
{
TwoPlayer twoPlayerGame = TwoPlayer.GetTwoPlayerGameInProgress(sender.User);

View file

@ -118,12 +118,12 @@ namespace HISP.Server
public const byte SWFMODULE_CLOSE = 0x16;
public const byte SWFMODULE_2PLAYER_CLOSED = 0x58;
public const byte SWFMODULE_2PLAYER = 0x50;
public const byte SWFMODULE_OPPONENT = 0x50;
public const byte SWFMODULE_ARENA = 0x52;
public const byte SWFMODULE_BRICKPOET = 0x5A;
public const byte SWFMODULE_DRAWINGROOM = 0x5B;
public const byte SWFMODULE_DRESSUPROOM = 0x5C;
public const byte SWFMODULE_BANDHALL = 0x51;
public const byte SWFMODULE_BROADCAST = 0x51;
public const byte DRAWINGROOM_GET_DRAWING = 0x14;
public const byte DRAWINGROOM_SAVE = 0x15;
@ -309,9 +309,9 @@ namespace HISP.Server
// this is used for *most* SwfModule
public static byte[] CreateForwardedSwfModule(byte[] request)
{
byte[] packet = new byte[1 + request.Length];
byte[] packet = new byte[1 + (request.Length-1)];
packet[0] = PACKET_SWFMODULE;
Array.Copy(request, 0, packet, 1, request.Length);
Array.Copy(request, 0, packet, 1, (request.Length-2));
return packet;
}
// Creates a byte array that contains "Bird Map" data

View file

@ -30,8 +30,8 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.8.67.0")]
[assembly: AssemblyFileVersion("1.8.67.0")]
[assembly: AssemblyVersion("1.8.68.0")]
[assembly: AssemblyFileVersion("1.8.68.0")]