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

Merge #5967

Browse source 
5967: Fix crashes in editor when scrolling with up/down keys on empty sounds/images lists r=heinrich5991 a=Robyt3

The crashes were already present before #5751.

## 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 (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: Robert Müller <robytemueller@gmail.com>
This commit is contained in:
bors[bot] 2022-10-21 18:47:13 +00:00 committed by GitHub
parent 8feba4ecf6 f5a16c1c77
commit 529bbcefe9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 44 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
src/game/editor/editor.cpp
View file

@ -3987,55 +3987,58 @@ void CEditor::RenderImagesList(CUIRect ToolBox)
ToolBox.y += ScrollOffset.y; ToolBox.y += ScrollOffset.y;
bool ScrollToSelection = false; bool ScrollToSelection = false;
if(Input()->KeyPress(KEY_DOWN) && m_Dialog == DIALOG_NONE) if(m_Dialog == DIALOG_NONE && !m_Map.m_vpImages.empty())
{ {
int OldImage = m_SelectedImage; if(Input()->KeyPress(KEY_DOWN))
m_SelectedImage = clamp(m_SelectedImage, 0, (int)m_Map.m_vpImages.size() - 1);
for(size_t i = m_SelectedImage + 1; i < m_Map.m_vpImages.size(); i++)
{ {
if(m_Map.m_vpImages[i]->m_External == m_Map.m_vpImages[m_SelectedImage]->m_External) int OldImage = m_SelectedImage;
m_SelectedImage = clamp(m_SelectedImage, 0, (int)m_Map.m_vpImages.size() - 1);
for(size_t i = m_SelectedImage + 1; i < m_Map.m_vpImages.size(); i++)
{ {
m_SelectedImage = i; if(m_Map.m_vpImages[i]->m_External == m_Map.m_vpImages[m_SelectedImage]->m_External)
break;
}
}
if(m_SelectedImage == OldImage && !m_Map.m_vpImages[m_SelectedImage]->m_External)
{
for(size_t i = 0; i < m_Map.m_vpImages.size(); i++)
{
if(m_Map.m_vpImages[i]->m_External)
{ {
m_SelectedImage = i; m_SelectedImage = i;
break; break;
} }
} }
} if(m_SelectedImage == OldImage && !m_Map.m_vpImages[m_SelectedImage]->m_External)
ScrollToSelection = OldImage != m_SelectedImage;
}
if(Input()->KeyPress(KEY_UP) && m_Dialog == DIALOG_NONE)
{
int OldImage = m_SelectedImage;
m_SelectedImage = clamp(m_SelectedImage, 0, (int)m_Map.m_vpImages.size() - 1);
for(int i = m_SelectedImage - 1; i >= 0; i--)
{
if(m_Map.m_vpImages[i]->m_External == m_Map.m_vpImages[m_SelectedImage]->m_External)
{ {
m_SelectedImage = i; for(size_t i = 0; i < m_Map.m_vpImages.size(); i++)
break; {
if(m_Map.m_vpImages[i]->m_External)
{
m_SelectedImage = i;
break;
}
}
} }
ScrollToSelection = OldImage != m_SelectedImage;
} }
if(m_SelectedImage == OldImage && m_Map.m_vpImages[m_SelectedImage]->m_External) else if(Input()->KeyPress(KEY_UP))
{ {
for(int i = (int)m_Map.m_vpImages.size() - 1; i >= 0; i--) int OldImage = m_SelectedImage;
m_SelectedImage = clamp(m_SelectedImage, 0, (int)m_Map.m_vpImages.size() - 1);
for(int i = m_SelectedImage - 1; i >= 0; i--)
{ {
if(!m_Map.m_vpImages[i]->m_External) if(m_Map.m_vpImages[i]->m_External == m_Map.m_vpImages[m_SelectedImage]->m_External)
{ {
m_SelectedImage = i; m_SelectedImage = i;
break; break;
} }
} }
if(m_SelectedImage == OldImage && m_Map.m_vpImages[m_SelectedImage]->m_External)
{
for(int i = (int)m_Map.m_vpImages.size() - 1; i >= 0; i--)
{
if(!m_Map.m_vpImages[i]->m_External)
{
m_SelectedImage = i;
break;
}
}
}
ScrollToSelection = OldImage != m_SelectedImage;
} }
ScrollToSelection = OldImage != m_SelectedImage;
} }
for(int e = 0; e < 2; e++) // two passes, first embedded, then external for(int e = 0; e < 2; e++) // two passes, first embedded, then external
@ -4166,15 +4169,18 @@ void CEditor::RenderSounds(CUIRect ToolBox)
ToolBox.y += ScrollOffset.y; ToolBox.y += ScrollOffset.y;
bool ScrollToSelection = false; bool ScrollToSelection = false;
if(Input()->KeyPress(KEY_DOWN) && m_Dialog == DIALOG_NONE) if(m_Dialog == DIALOG_NONE && !m_Map.m_vpSounds.empty())
{ {
m_SelectedSound = (m_SelectedSound + 1) % m_Map.m_vpSounds.size(); if(Input()->KeyPress(KEY_DOWN))
ScrollToSelection = true; {
} m_SelectedSound = (m_SelectedSound + 1) % m_Map.m_vpSounds.size();
if(Input()->KeyPress(KEY_UP) && m_Dialog == DIALOG_NONE) ScrollToSelection = true;
{ }
m_SelectedSound = (m_SelectedSound + m_Map.m_vpSounds.size() - 1) % m_Map.m_vpSounds.size(); else if(Input()->KeyPress(KEY_UP))
ScrollToSelection = true; {
m_SelectedSound = (m_SelectedSound + m_Map.m_vpSounds.size() - 1) % m_Map.m_vpSounds.size();
ScrollToSelection = true;
}
} }
CUIRect Slot; CUIRect Slot;