From 0f6bd99d12984509623a7b3309aa45cacb4270cd Mon Sep 17 00:00:00 2001 From: Bojidar Marinov Date: Fri, 27 Jul 2018 21:27:06 +0300 Subject: [PATCH] Copy tile layer color to brush and picker --- src/game/editor/editor.cpp | 1 + src/game/editor/layer_tiles.cpp | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/src/game/editor/editor.cpp b/src/game/editor/editor.cpp index 06758f592..f59f681ad 100644 --- a/src/game/editor/editor.cpp +++ b/src/game/editor/editor.cpp @@ -2215,6 +2215,7 @@ void CEditor::DoMapEditor(CUIRect View) Graphics()->MapScreen(x, y, x+w, y+h); m_TilesetPicker.m_Image = t->m_Image; m_TilesetPicker.m_TexID = t->m_TexID; + m_TilesetPicker.m_Color = t->m_Color; m_TilesetPicker.Render(); if(m_ShowTileInfo) m_TilesetPicker.ShowInfo(); diff --git a/src/game/editor/layer_tiles.cpp b/src/game/editor/layer_tiles.cpp index a10668d01..a93566de2 100644 --- a/src/game/editor/layer_tiles.cpp +++ b/src/game/editor/layer_tiles.cpp @@ -179,6 +179,7 @@ int CLayerTiles::BrushGrab(CLayerGroup *pBrush, CUIRect Rect) pGrabbed->m_TexID = m_TexID; pGrabbed->m_Image = m_Image; pGrabbed->m_Game = m_Game; + pGrabbed->m_Color = m_Color; pBrush->AddLayer(pGrabbed); @@ -206,6 +207,7 @@ int CLayerTiles::BrushGrab(CLayerGroup *pBrush, CUIRect Rect) pGrabbed->m_TexID = m_TexID; pGrabbed->m_Image = m_Image; pGrabbed->m_Game = m_Game; + pGrabbed->m_Color = m_Color; pBrush->AddLayer(pGrabbed); @@ -239,6 +241,7 @@ int CLayerTiles::BrushGrab(CLayerGroup *pBrush, CUIRect Rect) pGrabbed->m_TexID = m_TexID; pGrabbed->m_Image = m_Image; pGrabbed->m_Game = m_Game; + pGrabbed->m_Color = m_Color; pBrush->AddLayer(pGrabbed); @@ -271,6 +274,7 @@ int CLayerTiles::BrushGrab(CLayerGroup *pBrush, CUIRect Rect) pGrabbed->m_TexID = m_TexID; pGrabbed->m_Image = m_Image; pGrabbed->m_Game = m_Game; + pGrabbed->m_Color = m_Color; pBrush->AddLayer(pGrabbed); // copy the tiles @@ -299,6 +303,7 @@ int CLayerTiles::BrushGrab(CLayerGroup *pBrush, CUIRect Rect) pGrabbed->m_TexID = m_TexID; pGrabbed->m_Image = m_Image; pGrabbed->m_Game = m_Game; + pGrabbed->m_Color = m_Color; pBrush->AddLayer(pGrabbed); // copy the tiles @@ -314,6 +319,7 @@ int CLayerTiles::BrushGrab(CLayerGroup *pBrush, CUIRect Rect) pGrabbed->m_TexID = m_TexID; pGrabbed->m_Image = m_Image; pGrabbed->m_Game = m_Game; + pGrabbed->m_Color = m_Color; pBrush->AddLayer(pGrabbed); // copy the tiles