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

Add shift by, fix id overlap

Browse source
This commit is contained in:
Learath 2020-02-28 15:33:32 +03:00
parent a50e59d4f6
commit f2103881c8
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -979,6 +979,7 @@ int CLayerTiles::RenderCommonProperties(CEditor *pEditor, CUIRect *pToolbox, arr
PROP_WIDTH=0, PROP_WIDTH=0,
PROP_HEIGHT, PROP_HEIGHT,
PROP_SHIFT, PROP_SHIFT,
PROP_SHIFT_BY,
PROP_COLOR, PROP_COLOR,
NUM_PROPS, NUM_PROPS,
}; };
@ -997,6 +998,7 @@ int CLayerTiles::RenderCommonProperties(CEditor *pEditor, CUIRect *pToolbox, arr
{"Width", Width, PROPTYPE_INT_SCROLL, 1, 100000}, {"Width", Width, PROPTYPE_INT_SCROLL, 1, 100000},
{"Height", Height, PROPTYPE_INT_SCROLL, 1, 100000}, {"Height", Height, PROPTYPE_INT_SCROLL, 1, 100000},
{"Shift", 0, PROPTYPE_SHIFT, 0, 0}, {"Shift", 0, PROPTYPE_SHIFT, 0, 0},
{"Shift by", pEditor->m_ShiftBy, PROPTYPE_INT_SCROLL, 1, 100000},
{"Color", Color, PROPTYPE_COLOR, 0, 0}, {"Color", Color, PROPTYPE_COLOR, 0, 0},
{0}, {0},
}; };
@ -1036,6 +1038,8 @@ int CLayerTiles::RenderCommonProperties(CEditor *pEditor, CUIRect *pToolbox, arr
pLayer->Shift(NewVal); pLayer->Shift(NewVal);
}); });
} }
else if(Prop == PROP_SHIFT_BY)
pEditor->m_ShiftBy = NewVal;
else if(Prop == PROP_COLOR) else if(Prop == PROP_COLOR)
{ {
for_each(pLayers.all(), [NewVal](CLayerTiles *pLayer){ for_each(pLayers.all(), [NewVal](CLayerTiles *pLayer){