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.

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

add a type specifier where one was forgor #29250

Merged
merged 4 commits into from
Jun 20, 2024
Merged

add a type specifier where one was forgor #29250

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
029de58
add a type specifier where one was forgor
IProduceWidgets Jun 20, 2024
62a10de
Fix other way because degub conditions
IProduceWidgets Jun 20, 2024
1992d52
okay this feels kinda dumb but it does fix it.
IProduceWidgets Jun 20, 2024
d93075b
Update Content.Client/Effects/ColorFlashEffectSystem.cs
metalgearsloth Jun 20, 2024
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
6 changes: 3 additions & 3 deletions Content.Client/Effects/ColorFlashEffectSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,12 @@ private void OnColorFlashEffect(ColorFlashEffectEvent ev)
continue;
}

#if DEBUG
if (!TryComp(ent, out ColorFlashEffectComponent? comp))
{
#if DEBUG
DebugTools.Assert(!_animation.HasRunningAnimation(ent, AnimationKey));
}
#endif
}

_animation.Stop(ent, AnimationKey);
var animation = GetDamageAnimation(ent, color, sprite);
Expand All @@ -124,7 +124,7 @@ private void OnColorFlashEffect(ColorFlashEffectEvent ev)
continue;
}

comp = EnsureComp<ColorFlashEffectComponent>(ent);
EnsureComp<ColorFlashEffectComponent>(ent, out comp);
Comment on lines 126 to +127
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

C++ change.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wha?

comp.NetSyncEnabled = false;
comp.Color = sprite.Color;

Expand Down
Loading