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

Get rid of the clamp that breaks most editor value selection

Browse source
This commit is contained in:
def 2020-05-30 09:08:59 +02:00
parent 4cc1bc0cf8
commit cf7dad8125
4 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3330,9 +3330,6 @@ int CEditor::DoProperties(CUIRect *pToolBox, CProperty *pProps, int *pIDs, int *
}
}
if(Change != -1)
*pNewVal = clamp(*pNewVal, pProps[Change].m_Min, pProps[Change].m_Max);
return Change;
}

7
src/game/editor/layer_quads.cpp
View file

@ -240,7 +240,7 @@ int CLayerQuads::RenderProperties(CUIRect *pToolBox)
};
CProperty aProps[] = {
{"Image", m_Image, PROPTYPE_IMAGE, -1, m_pEditor->m_Map.m_lImages.size()},
{"Image", m_Image, PROPTYPE_IMAGE, -1, 0},
{0},
};
@ -252,7 +252,10 @@ int CLayerQuads::RenderProperties(CUIRect *pToolBox)
if(Prop == PROP_IMAGE)
{
m_Image = NewVal;
if(NewVal >= 0)
m_Image = NewVal%m_pEditor->m_Map.m_lImages.size();
else
m_Image = -1;
}
return 0;

7
src/game/editor/layer_sounds.cpp
View file

@ -199,7 +199,7 @@ int CLayerSounds::RenderProperties(CUIRect *pToolBox)
};
CProperty aProps[] = {
{"Sound", m_Sound, PROPTYPE_SOUND, -1, m_pEditor->m_Map.m_lSounds.size()},
{"Sound", m_Sound, PROPTYPE_SOUND, -1, 0},
{0},
};
@ -211,7 +211,10 @@ int CLayerSounds::RenderProperties(CUIRect *pToolBox)
if(Prop == PROP_SOUND)
{
m_Sound = NewVal;
if(NewVal >= 0)
m_Sound = NewVal%m_pEditor->m_Map.m_lSounds.size();
else
m_Sound = -1;
}
return 0;

4
src/game/editor/layer_tiles.cpp
View file

@ -870,7 +870,7 @@ int CLayerTiles::RenderProperties(CUIRect *pToolBox)
{"Height", m_Height, PROPTYPE_INT_SCROLL, 1, 100000},
{"Shift", 0, PROPTYPE_SHIFT, 0, 0},
{"Shift by", m_pEditor->m_ShiftBy, PROPTYPE_INT_SCROLL, 1, 100000},
{"Image", m_Image, PROPTYPE_IMAGE, 0, m_pEditor->m_Map.m_lImages.size()},
{"Image", m_Image, PROPTYPE_IMAGE, 0, 0},
{"Color", Color, PROPTYPE_COLOR, 0, 0},
{"Color Env", m_ColorEnv+1, PROPTYPE_ENVELOPE, 0, 0},
{"Color TO", m_ColorEnvOffset, PROPTYPE_INT_SCROLL, -1000000, 1000000},
@ -925,9 +925,11 @@ int CLayerTiles::RenderProperties(CUIRect *pToolBox)
if (NewVal == -1)
{
m_Texture = IGraphics::CTextureHandle();
m_Image = -1;
}
else
{
m_Image = NewVal%m_pEditor->m_Map.m_lImages.size();
m_AutoMapperConfig = -1;
}
}