mirror of
https://github.com/ddnet/ddnet.git
synced 2024-11-10 01:58:19 +00:00
Merge #5347
5347: Fix deleting envelopes not updating sounds r=def- a=C0D3D3V Original fix by Ravie... updated to latest code I do not really know how to trigger the bug, but for me adding and deleting sounds to the map, worked.... Since it is only the updated version from Ravie I think it works `@HiRavie` maybe you can test it again ## Checklist - [x] Tested the change ingame - [ ] Provided screenshots if it is a visual change - [ ] Tested in combination with possibly related configuration options - [ ] Written a unit test if it works standalone, system.c especially - [ ] Considered possible null pointers and out of bounds array indexing - [x] 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: c0d3d3v <c0d3d3v@mag-keinen-spam.de>
This commit is contained in:
commit
152ee93e16
|
@ -6190,6 +6190,21 @@ void CEditorMap::DeleteEnvelope(int Index)
|
|||
if(pLayerTiles->m_ColorEnv > Index)
|
||||
pLayerTiles->m_ColorEnv--;
|
||||
}
|
||||
else if(pLayer->m_Type == LAYERTYPE_SOUNDS)
|
||||
{
|
||||
CLayerSounds *pLayerSounds = static_cast<CLayerSounds *>(pLayer);
|
||||
for(auto &Source : pLayerSounds->m_lSources)
|
||||
{
|
||||
if(Source.m_PosEnv == Index)
|
||||
Source.m_PosEnv = -1;
|
||||
else if(Source.m_PosEnv > Index)
|
||||
Source.m_PosEnv--;
|
||||
if(Source.m_SoundEnv == Index)
|
||||
Source.m_SoundEnv = -1;
|
||||
else if(Source.m_SoundEnv > Index)
|
||||
Source.m_SoundEnv--;
|
||||
}
|
||||
}
|
||||
|
||||
m_lEnvelopes.erase(m_lEnvelopes.begin() + Index);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue