simplify a few comparisons

This commit is contained in:
UnknownShadow200 2017-08-26 17:17:15 +10:00
parent 3637009ab1
commit 06014de43f

View File

@ -34,30 +34,33 @@ namespace MCGalaxy.Blocks.Physics {
case 1: case 1:
case 2: case 2:
case 3: case 3:
if (closest.Pos.BlockX - x != 0) { if (closest.Pos.BlockX != x) {
index = lvl.PosToInt((ushort)(x + Math.Sign(closest.Pos.BlockX - x)), y, z); index = lvl.PosToInt((ushort)(x + Math.Sign(closest.Pos.BlockX - x)), y, z);
if (MoveFish(lvl, C.b, index, target)) return; if (MoveFish(lvl, C.b, index, target)) return;
} }
dirsVisited++; dirsVisited++;
if (dirsVisited >= 3) break; if (dirsVisited >= 3) break;
goto case 4; goto case 4;
case 4: case 4:
case 5: case 5:
case 6: case 6:
if (closest.Pos.BlockY - y != 0) { if (closest.Pos.BlockY != y) {
index = lvl.PosToInt(x, (ushort)(y + Math.Sign(closest.Pos.BlockY - y)), z); index = lvl.PosToInt(x, (ushort)(y + Math.Sign(closest.Pos.BlockY - y)), z);
if (MoveFish(lvl, C.b, index, target)) return; if (MoveFish(lvl, C.b, index, target)) return;
} }
dirsVisited++; dirsVisited++;
if (dirsVisited >= 3) break; if (dirsVisited >= 3) break;
goto case 7; goto case 7;
case 7: case 7:
case 8: case 8:
case 9: case 9:
if (closest.Pos.BlockZ - z != 0) { if (closest.Pos.BlockZ != z) {
index = lvl.PosToInt(x, y, (ushort)(z + Math.Sign(closest.Pos.BlockZ - z))); index = lvl.PosToInt(x, y, (ushort)(z + Math.Sign(closest.Pos.BlockZ - z)));
if (MoveFish(lvl, C.b, index, target)) return; if (MoveFish(lvl, C.b, index, target)) return;
} }
dirsVisited++; dirsVisited++;
if (dirsVisited >= 3) break; if (dirsVisited >= 3) break;
goto case 1; goto case 1;
@ -79,30 +82,33 @@ namespace MCGalaxy.Blocks.Physics {
case 1: case 1:
case 2: case 2:
case 3: case 3:
if (closest.Pos.BlockX - x != 0) { if (closest.Pos.BlockX != x) {
index = lvl.PosToInt((ushort)(x - Math.Sign(closest.Pos.BlockX - x)), y, z); index = lvl.PosToInt((ushort)(x - Math.Sign(closest.Pos.BlockX - x)), y, z);
if (MoveFish(lvl, C.b, index, target)) return; if (MoveFish(lvl, C.b, index, target)) return;
} }
dirsVisited++; dirsVisited++;
if (dirsVisited >= 3) break; if (dirsVisited >= 3) break;
goto case 4; goto case 4;
case 4: case 4:
case 5: case 5:
case 6: case 6:
if (closest.Pos.BlockY - y != 0) { if (closest.Pos.BlockY != y) {
index = lvl.PosToInt(x, (ushort)(y - Math.Sign(closest.Pos.BlockY - y)), z); index = lvl.PosToInt(x, (ushort)(y - Math.Sign(closest.Pos.BlockY - y)), z);
if (MoveFish(lvl, C.b, index, target)) return; if (MoveFish(lvl, C.b, index, target)) return;
} }
dirsVisited++; dirsVisited++;
if (dirsVisited >= 3) break; if (dirsVisited >= 3) break;
goto case 7; goto case 7;
case 7: case 7:
case 8: case 8:
case 9: case 9:
if (closest.Pos.BlockZ - z != 0) { if (closest.Pos.BlockZ != z) {
index = lvl.PosToInt(x, y, (ushort)(z - Math.Sign(closest.Pos.BlockZ - z))); index = lvl.PosToInt(x, y, (ushort)(z - Math.Sign(closest.Pos.BlockZ - z)));
if (MoveFish(lvl, C.b, index, target)) return; if (MoveFish(lvl, C.b, index, target)) return;
} }
dirsVisited++; dirsVisited++;
if (dirsVisited >= 3) break; if (dirsVisited >= 3) break;
goto case 1; goto case 1;