edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #6478

Browse source 
6478: fix start size of freezing flakes particles r=Chairn a=Jupeyy

fixes [this](a9ef757475 (diff-7e0a2abd9e284b400b03e461e21bd5b789b83afa10478be5d01d222a7af2daa4R91))

and [this](a9ef757475 (diff-7e0a2abd9e284b400b03e461e21bd5b789b83afa10478be5d01d222a7af2daa4R209))
## Checklist

- [ ] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test (especially base/) or added coverage to integration test
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: Jupeyy <jupjopjap@gmail.com>
This commit is contained in:
bors[bot] 2023-03-28 20:42:56 +00:00 committed by GitHub
parent 98a5c4ece0 ffe3d26e59
commit 66df293768
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/game/client/components/effects.cpp
View file

@ -88,7 +88,7 @@ void CEffects::FreezingFlakes(vec2 Pos, vec2 Size)
p.m_Pos = Pos + vec2(random_float(-0.5f, 0.5f), random_float(-0.5f, 0.5f)) * Size;
p.m_Vel = vec2(0, 0);
p.m_LifeSpan = 1.5f;
p.m_StartSize = random_float(1.0f, 1.5f) * 16.0f;
p.m_StartSize = random_float(0.5f, 1.5f) * 16.0f;
p.m_EndSize = p.m_StartSize * 0.5f;
p.m_UseAlphaFading = true;
p.m_StartAlpha = 1.0f;
@ -206,7 +206,7 @@ void CEffects::PlayerDeath(vec2 Pos, int ClientID)
p.SetDefault();
p.m_Spr = SPRITE_PART_SPLAT01 + (rand() % 3);
p.m_Pos = Pos;
p.m_Vel = random_direction() * (random_float(1.0f, 1.1f) * 900.0f);
p.m_Vel = random_direction() * (random_float(0.1f, 1.1f) * 900.0f);
p.m_LifeSpan = random_float(0.3f, 0.6f);
p.m_StartSize = random_float(24.0f, 40.0f);
p.m_EndSize = 0;