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

Don't copy alpha when coloring the brush

Browse source
This commit is contained in:
Bojidar Marinov 2018-08-09 13:07:49 +03:00
parent 461a83871b
commit 80c829681e
No known key found for this signature in database
GPG key ID: 4D546A8F1E091856
2 changed files with 10 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

@ -2255,6 +2255,7 @@ void CEditor::DoMapEditor(CUIRect View)
m_TilesetPicker.m_Image = t->m_Image;
m_TilesetPicker.m_TexID = t->m_TexID;
m_TilesetPicker.m_Color = t->m_Color;
m_TilesetPicker.m_Color.a = 255;
m_TilesetPicker.Render();
if(m_ShowTileInfo)
m_TilesetPicker.ShowInfo();

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

@ -180,6 +180,7 @@ int CLayerTiles::BrushGrab(CLayerGroup *pBrush, CUIRect Rect)
pGrabbed->m_Image = m_Image;
pGrabbed->m_Game = m_Game;
pGrabbed->m_Color = m_Color;
pGrabbed->m_Color.a = 255;
pBrush->AddLayer(pGrabbed);
@ -208,6 +209,7 @@ int CLayerTiles::BrushGrab(CLayerGroup *pBrush, CUIRect Rect)
pGrabbed->m_Image = m_Image;
pGrabbed->m_Game = m_Game;
pGrabbed->m_Color = m_Color;
pGrabbed->m_Color.a = 255;
pBrush->AddLayer(pGrabbed);
@ -242,6 +244,7 @@ int CLayerTiles::BrushGrab(CLayerGroup *pBrush, CUIRect Rect)
pGrabbed->m_Image = m_Image;
pGrabbed->m_Game = m_Game;
pGrabbed->m_Color = m_Color;
pGrabbed->m_Color.a = 255;
pBrush->AddLayer(pGrabbed);
@ -275,6 +278,8 @@ int CLayerTiles::BrushGrab(CLayerGroup *pBrush, CUIRect Rect)
pGrabbed->m_Image = m_Image;
pGrabbed->m_Game = m_Game;
pGrabbed->m_Color = m_Color;
pGrabbed->m_Color.a = 255;
pBrush->AddLayer(pGrabbed);
// copy the tiles
@ -304,6 +309,8 @@ int CLayerTiles::BrushGrab(CLayerGroup *pBrush, CUIRect Rect)
pGrabbed->m_Image = m_Image;
pGrabbed->m_Game = m_Game;
pGrabbed->m_Color = m_Color;
pGrabbed->m_Color.a = 255;
pBrush->AddLayer(pGrabbed);
// copy the tiles
@ -320,6 +327,8 @@ int CLayerTiles::BrushGrab(CLayerGroup *pBrush, CUIRect Rect)
pGrabbed->m_Image = m_Image;
pGrabbed->m_Game = m_Game;
pGrabbed->m_Color = m_Color;
pGrabbed->m_Color.a = 255;
pBrush->AddLayer(pGrabbed);
// copy the tiles