Skip to content
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.

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

chore: split VE script up #1598

Merged
merged 6 commits into from
May 27, 2024
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
consistent if statements
Tiernan-Alderman committed May 26, 2024
commit 9e150076f29984855c494a312ee20f482802d84a
9 changes: 6 additions & 3 deletions dScripts/ai/AG/AgShipShake.cpp
Original file line number Diff line number Diff line change
@@ -55,10 +55,13 @@ void AgShipShake::OnTimerDone(Entity* self, std::string timerName) {

self->AddTimer("ShipShakeExplode", 5.0f);

if (shipFxObject2) { RenderComponent::PlayAnimation(shipFxObject2, u"explosion"); }
if (shipFxObject2)
RenderComponent::PlayAnimation(shipFxObject2, u"explosion");
} else if (timerName == "ShipShakeExplode") {
if (shipFxObject) { RenderComponent::PlayAnimation(shipFxObject, u"idle"); }
if (shipFxObject2) { RenderComponent::PlayAnimation(shipFxObject2, u"idle"); }
if (shipFxObject)
RenderComponent::PlayAnimation(shipFxObject, u"idle");
if (shipFxObject2)
RenderComponent::PlayAnimation(shipFxObject2, u"idle");
}
}