diff options
| author | oy <Tom_Adams@web.de> | 2011-01-04 11:38:14 +0100 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-01-04 11:38:14 +0100 |
| commit | 336f00ae89be5051be20632c728076a436d93d3c (patch) | |
| tree | 61f359e7263c9a2ed7741e8a714f9235d35adfb3 /src/game/client | |
| parent | 533d28e35a8f7278456abb6ef1b4d5e9e36063a9 (diff) | |
| download | zcatch-336f00ae89be5051be20632c728076a436d93d3c.tar.gz zcatch-336f00ae89be5051be20632c728076a436d93d3c.zip | |
added colours for tile layers by Choupom
Diffstat (limited to 'src/game/client')
| -rw-r--r-- | src/game/client/components/maplayers.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/game/client/components/maplayers.cpp b/src/game/client/components/maplayers.cpp index b882726d..2fdd2acc 100644 --- a/src/game/client/components/maplayers.cpp +++ b/src/game/client/components/maplayers.cpp @@ -182,12 +182,13 @@ void CMapLayers::OnRender() Graphics()->TextureSet(-1); else Graphics()->TextureSet(m_pClient->m_pMapimages->Get(pTMap->m_Image)); - + CTile *pTiles = (CTile *)m_pLayers->Map()->GetData(pTMap->m_Data); Graphics()->BlendNone(); - RenderTools()->RenderTilemap(pTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, vec4(1,1,1,1), TILERENDERFLAG_EXTEND|LAYERRENDERFLAG_OPAQUE); + vec4 Color = vec4(pTMap->m_Color.r/255.0f, pTMap->m_Color.g/255.0f, pTMap->m_Color.b/255.0f, pTMap->m_Color.a/255.0f); + RenderTools()->RenderTilemap(pTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, Color, TILERENDERFLAG_EXTEND|LAYERRENDERFLAG_OPAQUE); Graphics()->BlendNormal(); - RenderTools()->RenderTilemap(pTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, vec4(1,1,1,1), TILERENDERFLAG_EXTEND|LAYERRENDERFLAG_TRANSPARENT); + RenderTools()->RenderTilemap(pTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, Color, TILERENDERFLAG_EXTEND|LAYERRENDERFLAG_TRANSPARENT); } else if(pLayer->m_Type == LAYERTYPE_QUADS) { |