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

Fix crash introduced by 1e2dce0. Close #1362

Browse source
This commit is contained in:
Learath 2018-10-30 18:13:32 +01:00
parent aab6fa152a
commit 0ecda0ced4
1 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -364,9 +364,7 @@ int CLayerTiles::BrushGrab(CLayerGroup *pBrush, CUIRect Rect)
void CLayerTiles::FillSelection(bool Empty, CLayer *pBrush, CUIRect Rect)
{
if(m_Readonly)
return;
if(pBrush->m_Type != LAYERTYPE_TILES)
if(m_Readonly || Empty || pBrush->m_Type != LAYERTYPE_TILES)
return;
Snap(&Rect);
@ -1015,9 +1013,7 @@ void CLayerTele::BrushRotate(float Amount)
void CLayerTele::FillSelection(bool Empty, CLayer *pBrush, CUIRect Rect)
{
if(m_Readonly)
return;
if(pBrush->m_Type != LAYERTYPE_TILES)
if(m_Readonly || Empty || pBrush->m_Type != LAYERTYPE_TILES)
return;
Snap(&Rect); // corrects Rect; no need of <=
@ -1282,9 +1278,7 @@ void CLayerSpeedup::BrushRotate(float Amount)
void CLayerSpeedup::FillSelection(bool Empty, CLayer *pBrush, CUIRect Rect)
{
if(m_Readonly)
return;
if(pBrush->m_Type != LAYERTYPE_TILES)
if(m_Readonly || Empty || pBrush->m_Type != LAYERTYPE_TILES)
return;
Snap(&Rect); // corrects Rect; no need of <=
@ -1561,9 +1555,7 @@ void CLayerSwitch::BrushDraw(CLayer *pBrush, float wx, float wy)
void CLayerSwitch::FillSelection(bool Empty, CLayer *pBrush, CUIRect Rect)
{
if(m_Readonly)
return;
if(pBrush->m_Type != LAYERTYPE_TILES)
if(m_Readonly || Empty || pBrush->m_Type != LAYERTYPE_TILES)
return;
Snap(&Rect); // corrects Rect; no need of <=
@ -1825,9 +1817,7 @@ void CLayerTune::BrushRotate(float Amount)
void CLayerTune::FillSelection(bool Empty, CLayer *pBrush, CUIRect Rect)
{
if(m_Readonly)
return;
if(pBrush->m_Type != LAYERTYPE_TILES)
if(m_Readonly || Empty || pBrush->m_Type != LAYERTYPE_TILES)
return;
Snap(&Rect); // corrects Rect; no need of <=