warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Modernization Fixes & Updates to Default Values (#3)

Browse source
This commit is contained in:
Kamron Batman 2018-10-28 00:33:16 -07:00 • committed by GitHub
parent 445eddff68
commit dcf64091b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
768 changed files with 10507 additions and 14196 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Scripts/Engines/Pathing/FastMovement.cs
View file

@ -53,8 +53,6 @@ namespace Server.Movement
return false;
}
int startZ, startTop;
IEnumerable<Item> itemsStart, itemsForward, itemsLeft, itemsRight;
bool ignoreMovableImpassables = MovementImpl.IgnoreMovableImpassables;
@ -85,7 +83,7 @@ namespace Server.Movement
itemsRight = Enumerable.Empty<Item>();
}
GetStartZ(m, map, loc, itemsStart, out startZ, out startTop);
GetStartZ(m, map, loc, itemsStart, out int startZ, out int startTop);
List<Item> list = null;
@ -95,13 +93,11 @@ namespace Server.Movement
if (moveIsOk && checkDiagonals)
{
int hold;
if (m.Player && m.AccessLevel < AccessLevel.GameMaster)
{
MovementPool.AcquireMoveCache(ref list, itemsLeft);
if (!Check(map, m, list, xLeft, yLeft, startTop, startZ, m.CanSwim, m.CantWalk, out hold))
if (!Check(map, m, list, xLeft, yLeft, startTop, startZ, m.CanSwim, m.CantWalk, out _))
{
moveIsOk = false;
}
@ -109,7 +105,7 @@ namespace Server.Movement
{
MovementPool.AcquireMoveCache(ref list, itemsRight);
if (!Check(map, m, list, xRight, yRight, startTop, startZ, m.CanSwim, m.CantWalk, out hold))
if (!Check(map, m, list, xRight, yRight, startTop, startZ, m.CanSwim, m.CantWalk, out _))
moveIsOk = false;
}
}
@ -117,11 +113,11 @@ namespace Server.Movement
{
MovementPool.AcquireMoveCache(ref list, itemsLeft);
if (!Check(map, m, list, xLeft, yLeft, startTop, startZ, m.CanSwim, m.CantWalk, out hold))
if (!Check(map, m, list, xLeft, yLeft, startTop, startZ, m.CanSwim, m.CantWalk, out _))
{
MovementPool.AcquireMoveCache(ref list, itemsRight);
if (!Check(map, m, list, xRight, yRight, startTop, startZ, m.CanSwim, m.CantWalk, out hold))
if (!Check(map, m, list, xRight, yRight, startTop, startZ, m.CanSwim, m.CantWalk, out _))
moveIsOk = false;
}
}
@ -136,7 +132,8 @@ namespace Server.Movement
public bool CheckMovement(Mobile m, Direction d, out int newZ)
{
if (!Enabled && _Successor != null) return _Successor.CheckMovement(m, d, out newZ);
if (!Enabled && _Successor != null)
return _Successor.CheckMovement(m, d, out newZ);
return CheckMovement(m, m.Map, m.Location, d, out newZ);
}