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

Copy tile layer color to brush and picker

Browse source
This commit is contained in:
Bojidar Marinov 2018-07-27 21:27:06 +03:00
parent 0336b662c5
commit 0f6bd99d12
No known key found for this signature in database
GPG key ID: 4D546A8F1E091856
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2215,6 +2215,7 @@ void CEditor::DoMapEditor(CUIRect View)
Graphics()->MapScreen(x, y, x+w, y+h); Graphics()->MapScreen(x, y, x+w, y+h);
m_TilesetPicker.m_Image = t->m_Image; m_TilesetPicker.m_Image = t->m_Image;
m_TilesetPicker.m_TexID = t->m_TexID; m_TilesetPicker.m_TexID = t->m_TexID;
m_TilesetPicker.m_Color = t->m_Color;
m_TilesetPicker.Render(); m_TilesetPicker.Render();
if(m_ShowTileInfo) if(m_ShowTileInfo)
m_TilesetPicker.ShowInfo(); m_TilesetPicker.ShowInfo();

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

@ -179,6 +179,7 @@ int CLayerTiles::BrushGrab(CLayerGroup *pBrush, CUIRect Rect)
pGrabbed->m_TexID = m_TexID; pGrabbed->m_TexID = m_TexID;
pGrabbed->m_Image = m_Image; pGrabbed->m_Image = m_Image;
pGrabbed->m_Game = m_Game; pGrabbed->m_Game = m_Game;
pGrabbed->m_Color = m_Color;
pBrush->AddLayer(pGrabbed); pBrush->AddLayer(pGrabbed);
@ -206,6 +207,7 @@ int CLayerTiles::BrushGrab(CLayerGroup *pBrush, CUIRect Rect)
pGrabbed->m_TexID = m_TexID; pGrabbed->m_TexID = m_TexID;
pGrabbed->m_Image = m_Image; pGrabbed->m_Image = m_Image;
pGrabbed->m_Game = m_Game; pGrabbed->m_Game = m_Game;
pGrabbed->m_Color = m_Color;
pBrush->AddLayer(pGrabbed); pBrush->AddLayer(pGrabbed);
@ -239,6 +241,7 @@ int CLayerTiles::BrushGrab(CLayerGroup *pBrush, CUIRect Rect)
pGrabbed->m_TexID = m_TexID; pGrabbed->m_TexID = m_TexID;
pGrabbed->m_Image = m_Image; pGrabbed->m_Image = m_Image;
pGrabbed->m_Game = m_Game; pGrabbed->m_Game = m_Game;
pGrabbed->m_Color = m_Color;
pBrush->AddLayer(pGrabbed); pBrush->AddLayer(pGrabbed);
@ -271,6 +274,7 @@ int CLayerTiles::BrushGrab(CLayerGroup *pBrush, CUIRect Rect)
pGrabbed->m_TexID = m_TexID; pGrabbed->m_TexID = m_TexID;
pGrabbed->m_Image = m_Image; pGrabbed->m_Image = m_Image;
pGrabbed->m_Game = m_Game; pGrabbed->m_Game = m_Game;
pGrabbed->m_Color = m_Color;
pBrush->AddLayer(pGrabbed); pBrush->AddLayer(pGrabbed);
// copy the tiles // copy the tiles
@ -299,6 +303,7 @@ int CLayerTiles::BrushGrab(CLayerGroup *pBrush, CUIRect Rect)
pGrabbed->m_TexID = m_TexID; pGrabbed->m_TexID = m_TexID;
pGrabbed->m_Image = m_Image; pGrabbed->m_Image = m_Image;
pGrabbed->m_Game = m_Game; pGrabbed->m_Game = m_Game;
pGrabbed->m_Color = m_Color;
pBrush->AddLayer(pGrabbed); pBrush->AddLayer(pGrabbed);
// copy the tiles // copy the tiles
@ -314,6 +319,7 @@ int CLayerTiles::BrushGrab(CLayerGroup *pBrush, CUIRect Rect)
pGrabbed->m_TexID = m_TexID; pGrabbed->m_TexID = m_TexID;
pGrabbed->m_Image = m_Image; pGrabbed->m_Image = m_Image;
pGrabbed->m_Game = m_Game; pGrabbed->m_Game = m_Game;
pGrabbed->m_Color = m_Color;
pBrush->AddLayer(pGrabbed); pBrush->AddLayer(pGrabbed);
// copy the tiles // copy the tiles