Skip to content

Commit f12a1ff

Browse files
committed
review stuff
1 parent 73d5b0d commit f12a1ff

File tree

2 files changed

+6
-14
lines changed

2 files changed

+6
-14
lines changed

Data/Base.rte/Devices/Shared/Scripts/ShieldWalkSounds.lua

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ function Create(self)
66
end
77
function ThreadedUpdate(self)
88

9+
self.shieldWalkSound.Pos = self.Pos;
910
self.parent = self:GetRootParent();
1011

1112
if IsAHuman(self.parent) then
@@ -15,10 +16,4 @@ function ThreadedUpdate(self)
1516
end
1617
end
1718

18-
end
19-
20-
function Update(self)
21-
22-
self.shieldWalkSound.Pos = self.Pos;
23-
2419
end

Data/Browncoats.rte/Devices/Shields/Eruptor/Eruptor.lua

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ end
5151

5252
function ThreadedUpdate(self)
5353

54+
self.bashWindupSound.Pos = self.Pos;
55+
self.bashSwingSound.Pos = self.Pos;
56+
5457
if self.equippedInMainHand then
5558
if not self.bashCoolDown then
5659
if self:IsActivated() then
@@ -74,6 +77,7 @@ function ThreadedUpdate(self)
7477
self.bashActive = false;
7578
self.bashTimer:Reset();
7679
self.bashCoolDown = true;
80+
self.hitActor = nil;
7781
self.StanceOffset = self.origStanceOffset;
7882
self.SharpStanceOffset = self.origSharpStanceOffset;
7983
elseif self.bashTimer:IsPastSimMS(self.bashWindupTime) then
@@ -114,7 +118,7 @@ end
114118

115119
function SyncedUpdate(self)
116120

117-
if MovableMan:ValidMO(self.hitActor) then
121+
if self.hitActor and MovableMan:ValidMO(self.hitActor) then
118122
local ctrl = self.hitActor:GetController();
119123

120124
self.hitActor.Status = math.max(1, self.hitActor.Status);
@@ -152,13 +156,6 @@ function SyncedUpdate(self)
152156

153157
end
154158

155-
function Update(self)
156-
157-
self.bashWindupSound.Pos = self.Pos;
158-
self.bashSwingSound.Pos = self.Pos;
159-
160-
end
161-
162159
function Destroy(self)
163160

164161
end

0 commit comments

Comments
 (0)