themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Change Broadcast and SendMessage to use Byte instead of Float

Browse source
This commit is contained in:
high 2011-06-14 16:23:33 -04:00
parent 4f5109af8e
commit 17b2ed7eea
3 changed files with 16 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TShockAPI/Commands.cs
View file

@ -276,19 +276,19 @@ namespace TShockAPI
} }
else else
{ {
Tools.SendMessage(args.PlayerID, "You are not in a party!", 255f, 240f, 20f); Tools.SendMessage(args.PlayerID, "You are not in a party!", 255, 240, 20);
} }
} }
public static void ThirdPerson(CommandArgs args) public static void ThirdPerson(CommandArgs args)
{ {
string msg = args.Message.Remove(0, 3); string msg = args.Message.Remove(0, 3);
Tools.Broadcast(string.Format("*{0} {1}", Tools.FindPlayer(args.PlayerID), msg, 205, 133, 63)); Tools.Broadcast(string.Format("*{0} {1}", Tools.FindPlayer(args.PlayerID), msg), 205, 133, 63);
} }
public static void Playing(CommandArgs args) public static void Playing(CommandArgs args)
{ {
Tools.SendMessage(args.PlayerID, string.Format("Current players: {0}.", Tools.GetPlayers()), 255f, 240f, 20f); Tools.SendMessage(args.PlayerID, string.Format("Current players: {0}.", Tools.GetPlayers()), 255, 240, 20);
} }
public static void DebugConfiguration(CommandArgs args) public static void DebugConfiguration(CommandArgs args)

2
TShockAPI/TShock.cs
View file

@ -602,7 +602,7 @@ namespace TShockAPI
if (players[ply].group.HasPermission("adminchat") && !text.StartsWith("/")) if (players[ply].group.HasPermission("adminchat") && !text.StartsWith("/"))
{ {
Tools.Broadcast(ConfigurationManager.adminChatPrefix + "<" + Main.player[ply].name + "> " + text, ConfigurationManager.adminChatRGB); Tools.Broadcast(ConfigurationManager.adminChatPrefix + "<" + Main.player[ply].name + "> " + text, (byte)ConfigurationManager.adminChatRGB[0], (byte)ConfigurationManager.adminChatRGB[1], (byte)ConfigurationManager.adminChatRGB[2]);
e.Handled = true; e.Handled = true;
return; return;
} }

31
TShockAPI/Tools.cs
View file

@ -94,28 +94,16 @@ namespace TShockAPI
/// <param name="msg">string message</param> /// <param name="msg">string message</param>
public static void Broadcast(string msg) public static void Broadcast(string msg)
{ {
for (int i = 0; i < Main.player.Length; i++) Broadcast(msg, 0, 255, 0);
{
SendMessage(i, msg);
}
Log.Info(string.Format("Broadcast: {0}", msg));
} }
public static void Broadcast(string msg, float red, float green, float blue) public static void Broadcast(string msg, byte red, byte green, byte blue)
{ {
for (int i = 0; i < Main.player.Length; i++) Broadcast(msg, new Color(red, green, blue));
{
SendMessage(i, msg, Tools.Clamp(red, 255, 0), Tools.Clamp(green, 255, 0), Tools.Clamp(blue, 255, 0));
}
Log.Info(string.Format("Broadcast: {0}", msg));
} }
public static void Broadcast(string msg, Color color)
public static void Broadcast(string msg, float[] colors)
{ {
for (int i = 0; i < Main.player.Length; i++) SendMessage(-1, msg, color);
{
SendMessage(i, msg, Tools.Clamp(colors[0], 255, 0), Tools.Clamp(colors[1], 255, 0), Tools.Clamp(colors[2], 255, 0));
}
Log.Info(string.Format("Broadcast: {0}", msg)); Log.Info(string.Format("Broadcast: {0}", msg));
} }
@ -125,9 +113,9 @@ namespace TShockAPI
/// <param name="ply">int socket thingy for the player from the server socket</param> /// <param name="ply">int socket thingy for the player from the server socket</param>
/// <param name="msg">String message</param> /// <param name="msg">String message</param>
public static void SendMessage(int ply, string msg, float red, float green, float blue) public static void SendMessage(int ply, string msg, byte red, byte green, byte blue)
{ {
NetMessage.SendData(0x19, ply, -1, msg, 255, red, green, blue); SendMessage(ply, msg, new Color(red, green, blue));
} }
/// <summary> /// <summary>
@ -167,7 +155,7 @@ namespace TShockAPI
/// <param name="message">string message</param> /// <param name="message">string message</param>
public static void SendMessage(int ply, string message) public static void SendMessage(int ply, string message)
{ {
NetMessage.SendData(0x19, ply, -1, message, 255, 0f, 255f, 0f); SendMessage(ply, message, 0, 255, 0);
} }
/// <summary> /// <summary>
@ -361,6 +349,7 @@ namespace TShockAPI
/// </summary> /// </summary>
/// <param name="ply">int player</param> /// <param name="ply">int player</param>
/// <param name="file">string filename reletave to savedir</param> /// <param name="file">string filename reletave to savedir</param>
//Todo: Fix this
public static void ShowFileToUser(int ply, string file) public static void ShowFileToUser(int ply, string file)
{ {
string foo = ""; string foo = "";
@ -380,7 +369,7 @@ namespace TShockAPI
{ {
try try
{ {
SendMessage(ply, foo, Clamp(Convert.ToInt32(pCc[0]), 255, 0), Clamp(Convert.ToInt32(pCc[1]), 255, 0), Clamp(Convert.ToInt32(pCc[2]), 255, 0)); SendMessage(ply, foo, (byte)Convert.ToInt32(pCc[0]), (byte)Convert.ToInt32(pCc[1]), (byte)Convert.ToInt32(pCc[2]));
continue; continue;
} }
catch (Exception e) catch (Exception e)