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

fixed shifting for front layer and switch layer

Browse source
This commit is contained in:
GreYFoXGTi 2010-10-22 17:02:11 +02:00
parent 743338ce95
commit 68c9323021
2 changed files with 74 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/editor/ed_editor.h
View file

@ -477,6 +477,7 @@ public:
CLayerFront(int w, int h);
virtual void Resize(int NewW, int NewH);
virtual void Shift(int Direction);
virtual void BrushDraw(CLayer *pBrush, float wx, float wy);
};
@ -489,6 +490,7 @@ public:
CTeleTile *m_pSwitchTile;
virtual void Resize(int NewW, int NewH);
virtual void Shift(int Direction);
virtual void BrushDraw(CLayer *pBrush, float wx, float wy);
virtual void FillSelection(bool Empty, CLayer *pBrush, CUIRect Rect);
};

72
src/game/editor/ed_layer_tiles.cpp
View file

@ -869,6 +869,42 @@ void CLayerFront::Resize(int NewW, int NewH)
m_pEditor->m_Map.m_pGameLayer->Resize(NewW, NewH);
}
void CLayerFront::Shift(int Direction)
{
CLayerTiles::Shift(Direction);
switch(Direction)
{
case 1:
{
// left
for(int y = 0; y < m_Height; ++y)
mem_move(&m_pTiles[y*m_Width], &m_pTiles[y*m_Width+1], (m_Width-1)*sizeof(CTile));
}
break;
case 2:
{
// right
for(int y = 0; y < m_Height; ++y)
mem_move(&m_pTiles[y*m_Width+1], &m_pTiles[y*m_Width], (m_Width-1)*sizeof(CTile));
}
break;
case 4:
{
// up
for(int y = 0; y < m_Height-1; ++y)
mem_copy(&m_pTiles[y*m_Width], &m_pTiles[(y+1)*m_Width], m_Width*sizeof(CTile));
}
break;
case 8:
{
// down
for(int y = m_Height-1; y > 0; --y)
mem_copy(&m_pTiles[y*m_Width], &m_pTiles[(y-1)*m_Width], m_Width*sizeof(CTile));
}
}
}
void CLayerFront::BrushDraw(CLayer *pBrush, float wx, float wy)
{
if(m_Readonly)
@ -931,6 +967,42 @@ void CLayerSwitch::Resize(int NewW, int NewH)
m_pEditor->m_Map.m_pGameLayer->Resize(NewW, NewH);
}
void CLayerSwitch::Shift(int Direction)
{
CLayerTiles::Shift(Direction);
switch(Direction)
{
case 1:
{
// left
for(int y = 0; y < m_Height; ++y)
mem_move(&m_pSwitchTile[y*m_Width], &m_pSwitchTile[y*m_Width+1], (m_Width-1)*sizeof(CTeleTile));
}
break;
case 2:
{
// right
for(int y = 0; y < m_Height; ++y)
mem_move(&m_pSwitchTile[y*m_Width+1], &m_pSwitchTile[y*m_Width], (m_Width-1)*sizeof(CTeleTile));
}
break;
case 4:
{
// up
for(int y = 0; y < m_Height-1; ++y)
mem_copy(&m_pSwitchTile[y*m_Width], &m_pSwitchTile[(y+1)*m_Width], m_Width*sizeof(CTeleTile));
}
break;
case 8:
{
// down
for(int y = m_Height-1; y > 0; --y)
mem_copy(&m_pSwitchTile[y*m_Width], &m_pSwitchTile[(y-1)*m_Width], m_Width*sizeof(CTeleTile));
}
}
}
void CLayerSwitch::BrushDraw(CLayer *pBrush, float wx, float wy)
{
CLayerSwitch *l = (CLayerSwitch *)pBrush;