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

Consistently allow rotations and flipping in editor

Browse source
This commit is contained in:
def 2014-10-01 18:55:53 +02:00
parent 32fedf3518
commit 85c953d25b
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -382,10 +382,9 @@ void CLayerTiles::BrushFlipX()
m_pTiles[y*m_Width+m_Width-1-x] = Tmp; m_pTiles[y*m_Width+m_Width-1-x] = Tmp;
} }
if(!m_Game && !m_Tele && !m_Speedup && !m_Tune) for(int y = 0; y < m_Height; y++)
for(int y = 0; y < m_Height; y++) for(int x = 0; x < m_Width; x++)
for(int x = 0; x < m_Width; x++) m_pTiles[y*m_Width+x].m_Flags ^= m_pTiles[y*m_Width+x].m_Flags&TILEFLAG_ROTATE ? TILEFLAG_HFLIP : TILEFLAG_VFLIP;
m_pTiles[y*m_Width+x].m_Flags ^= m_pTiles[y*m_Width+x].m_Flags&TILEFLAG_ROTATE ? TILEFLAG_HFLIP : TILEFLAG_VFLIP;
} }
void CLayerTiles::BrushFlipY() void CLayerTiles::BrushFlipY()
@ -398,10 +397,9 @@ void CLayerTiles::BrushFlipY()
m_pTiles[(m_Height-1-y)*m_Width+x] = Tmp; m_pTiles[(m_Height-1-y)*m_Width+x] = Tmp;
} }
if(!m_Game && !m_Tele && !m_Speedup && !m_Tune) for(int y = 0; y < m_Height; y++)
for(int y = 0; y < m_Height; y++) for(int x = 0; x < m_Width; x++)
for(int x = 0; x < m_Width; x++) m_pTiles[y*m_Width+x].m_Flags ^= m_pTiles[y*m_Width+x].m_Flags&TILEFLAG_ROTATE ? TILEFLAG_VFLIP : TILEFLAG_HFLIP;
m_pTiles[y*m_Width+x].m_Flags ^= m_pTiles[y*m_Width+x].m_Flags&TILEFLAG_ROTATE ? TILEFLAG_VFLIP : TILEFLAG_HFLIP;
} }
void CLayerTiles::BrushRotate(float Amount) void CLayerTiles::BrushRotate(float Amount)
@ -420,12 +418,9 @@ void CLayerTiles::BrushRotate(float Amount)
for(int y = m_Height-1; y >= 0; --y, ++pDst) for(int y = m_Height-1; y >= 0; --y, ++pDst)
{ {
*pDst = pTempData[y*m_Width+x]; *pDst = pTempData[y*m_Width+x];
if(!m_Game && !m_Tele && !m_Speedup && !m_Tune) if(pDst->m_Flags&TILEFLAG_ROTATE)
{ pDst->m_Flags ^= (TILEFLAG_HFLIP|TILEFLAG_VFLIP);
if(pDst->m_Flags&TILEFLAG_ROTATE) pDst->m_Flags ^= TILEFLAG_ROTATE;
pDst->m_Flags ^= (TILEFLAG_HFLIP|TILEFLAG_VFLIP);
pDst->m_Flags ^= TILEFLAG_ROTATE;
}
} }
int Temp = m_Width; int Temp = m_Width;