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

Remove warning ignore pragmas for just calling reads directly

Browse source
This commit is contained in:
Lucas Nicodemus 2015-04-13 00:19:11 -06:00
parent 6fe33b5c43
commit 362fcbceb3
1 changed files with 8 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

35
TShockAPI/GetDataHandlers.cs
View file

@ -1379,16 +1379,13 @@ namespace TShockAPI
string name = args.Data.ReadString(); string name = args.Data.ReadString();
byte hairDye = args.Data.ReadInt8(); byte hairDye = args.Data.ReadInt8();
BitsByte hideVisual = args.Data.ReadInt8(); BitsByte hideVisual = args.Data.ReadInt8();
// We have to read in some values so we can read in sequence; but they aren't all used.
#pragma warning disable 0219
Color hairColor = new Color(args.Data.ReadInt8(), args.Data.ReadInt8(), args.Data.ReadInt8()); Color hairColor = new Color(args.Data.ReadInt8(), args.Data.ReadInt8(), args.Data.ReadInt8());
Color skinColor = new Color(args.Data.ReadInt8(), args.Data.ReadInt8(), args.Data.ReadInt8()); args.Data.ReadInt8(); args.Data.ReadInt8(); args.Data.ReadInt8(); // skin color
Color eyeColor = new Color(args.Data.ReadInt8(), args.Data.ReadInt8(), args.Data.ReadInt8()); args.Data.ReadInt8(); args.Data.ReadInt8(); args.Data.ReadInt8(); // eye color
Color shirtColor = new Color(args.Data.ReadInt8(), args.Data.ReadInt8(), args.Data.ReadInt8()); Color shirtColor = new Color(args.Data.ReadInt8(), args.Data.ReadInt8(), args.Data.ReadInt8());
Color underShirtColor = new Color(args.Data.ReadInt8(), args.Data.ReadInt8(), args.Data.ReadInt8()); Color underShirtColor = new Color(args.Data.ReadInt8(), args.Data.ReadInt8(), args.Data.ReadInt8());
Color pantsColor = new Color(args.Data.ReadInt8(), args.Data.ReadInt8(), args.Data.ReadInt8()); Color pantsColor = new Color(args.Data.ReadInt8(), args.Data.ReadInt8(), args.Data.ReadInt8());
Color shoeColor = new Color(args.Data.ReadInt8(), args.Data.ReadInt8(), args.Data.ReadInt8()); Color shoeColor = new Color(args.Data.ReadInt8(), args.Data.ReadInt8(), args.Data.ReadInt8());
#pragma warning restore 0219
var difficulty = args.Data.ReadInt8(); var difficulty = args.Data.ReadInt8();
if (OnPlayerInfo(playerid, hair, male, difficulty, name)) if (OnPlayerInfo(playerid, hair, male, difficulty, name))
@ -2757,11 +2754,7 @@ namespace TShockAPI
int flag = args.Data.ReadByte(); int flag = args.Data.ReadByte();
int tileX = args.Data.ReadInt16(); int tileX = args.Data.ReadInt16();
int tileY = args.Data.ReadInt16(); int tileY = args.Data.ReadInt16();
// We have to read in some values so we can read in sequence; but they aren't all used. args.Data.ReadInt16(); // Ignore style
#pragma warning disable 0219
int style = args.Data.ReadInt16();
#pragma warning restore 0219
if (OnTileKill(tileX, tileY)) if (OnTileKill(tileX, tileY))
return true; return true;
@ -2877,14 +2870,10 @@ namespace TShockAPI
var x = args.Data.ReadInt16(); var x = args.Data.ReadInt16();
var y = args.Data.ReadInt16(); var y = args.Data.ReadInt16();
var b = args.Data.ReadInt8(); var b = args.Data.ReadInt8();
// Hide warning for not using name
#pragma warning disable 0219
var name = "";
if (b != 0 && b <= 20) if (b != 0 && b <= 20)
name = args.Data.ReadString(); args.Data.ReadString(); // Ignore the name
#pragma warning restore 0219
args.Player.ActiveChest = id; args.Player.ActiveChest = id;
if (TShock.CheckTilePermission(args.Player, x, y) && TShock.Config.RegionProtectChests) if (TShock.CheckTilePermission(args.Player, x, y) && TShock.Config.RegionProtectChests)
@ -2943,9 +2932,7 @@ namespace TShockAPI
var id = args.Data.ReadInt16(); var id = args.Data.ReadInt16();
var x = args.Data.ReadInt16(); var x = args.Data.ReadInt16();
var y = args.Data.ReadInt16(); var y = args.Data.ReadInt16();
#pragma warning disable 0219 args.Data.ReadString(); // Ignore sign text
var text = args.Data.ReadString();
#pragma warning restore 0219
if (OnSignEvent(id, x, y)) if (OnSignEvent(id, x, y))
return true; return true;
@ -3141,10 +3128,7 @@ namespace TShockAPI
var id = args.Data.ReadInt8(); var id = args.Data.ReadInt8();
var direction = (byte)(args.Data.ReadInt8() - 1); var direction = (byte)(args.Data.ReadInt8() - 1);
var dmg = args.Data.ReadInt16(); var dmg = args.Data.ReadInt16();
// Ignore text not being read args.Data.ReadString(); // don't store damage text
#pragma warning disable 0219
var text = args.Data.ReadString();
#pragma warning restore 0219
var bits = (BitsByte)args.Data.ReadInt8(); var bits = (BitsByte)args.Data.ReadInt8();
var pvp = bits[0]; var pvp = bits[0];
var crit = bits[1]; var crit = bits[1];
@ -3568,13 +3552,10 @@ namespace TShockAPI
private static bool HandleDoorUse(GetDataHandlerArgs args) private static bool HandleDoorUse(GetDataHandlerArgs args)
{ {
// close and dir aren't read; ignore warnings for them args.Data.ReadByte(); // Ignore close
#pragma warning disable 0219
var close = args.Data.ReadByte();
var x = args.Data.ReadInt16(); var x = args.Data.ReadInt16();
var y = args.Data.ReadInt16(); var y = args.Data.ReadInt16();
var dir = args.Data.ReadByte() == 0 ? -1 : 1; /* var dir = */ args.Data.ReadByte(); //== 0 ? -1 : 1; // Ignore direction
#pragma warning restore 0219
if (x >= Main.maxTilesX || y >= Main.maxTilesY || x < 0 || y < 0) // Check for out of range if (x >= Main.maxTilesX || y >= Main.maxTilesY || x < 0 || y < 0) // Check for out of range
return true; return true;