Skip to content

Fix Queued weapons sometimes returning stale data #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DasKeifer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Queued weapons sometimes returning stale data #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions functions/pawn.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ end

function onPawnClassInitialized(BoardPawn, pawn)

-- Reference to overridden vanilla functions
-- Reference to overridden vanilla/modloader functions
BoardPawn.AddWeaponVanilla = pawn.AddWeapon
BoardPawn.GetArmedWeaponVanilla = BoardPawn.GetArmedWeapon
BoardPawn.GetEquippedWeaponsVanilla = BoardPawn.GetEquippedWeapons
BoardPawn.GetPoweredWeaponsVanilla = BoardPawn.GetPoweredWeapons
BoardPawn.GetQueuedVanilla = pawn.GetQueued
BoardPawn.IsJumperVanilla = pawn.IsJumper
BoardPawn.IsTeleporterVanilla = pawn.IsTeleporter
BoardPawn.IsWeaponEquippedVanilla = BoardPawn.IsWeaponEquipped
Expand All @@ -27,7 +28,7 @@ function onPawnClassInitialized(BoardPawn, pawn)
BoardPawn.SetFrozenVanilla = pawn.SetFrozen
BoardPawn.SetMechVanilla = pawn.SetMech
BoardPawn.SetShieldVanilla = pawn.SetShield


-- With the addition of BoardPawn.IsNeutral,
-- mod loader's BoardPawn.SetNeutral is no longer needed.
Expand Down Expand Up @@ -360,6 +361,25 @@ function onPawnClassInitialized(BoardPawn, pawn)

return self:GetPoweredWeaponsVanilla()
end

BoardPawn.GetQueued = function(self)
Assert.Equals("userdata", type(self), "Argument #0")

local memedit = memedit:get()
if memedit then
local target = self:GetQueuedTarget()
if target and Board:IsValid(target) then
return {
piOrigin = self:GetSpace(),
piTarget = target,
piQueuedShot = target,
iQueuedSkill = self:GetSelectedWeapon(),
}
end
return nil
end
self:GetQueuedVanilla()
end

BoardPawn.GetQueuedTarget = function(self)
Assert.Equals("userdata", type(self), "Argument #0")
Expand Down