diff options
| author | oy <tom_adams@web.de> | 2011-08-13 09:20:40 -0700 |
|---|---|---|
| committer | oy <tom_adams@web.de> | 2011-08-13 09:20:40 -0700 |
| commit | 3fba3ee13e93bc6f0086e282668a8ab579ba07da (patch) | |
| tree | c17c0042e9865ea0d6c0476ee7ef930b4dbcab35 /src/game/editor/layer_tiles.cpp | |
| parent | c56cfa12d511559b096579d4e7a80b7cb6bbb6fe (diff) | |
| parent | c6fd4a2cc57f8d9dec7164aff98f5a73abc9698d (diff) | |
| download | zcatch-3fba3ee13e93bc6f0086e282668a8ab579ba07da.tar.gz zcatch-3fba3ee13e93bc6f0086e282668a8ab579ba07da.zip | |
Merge pull request #832 from GreYFoX/oypull1
Cleanup
Diffstat (limited to 'src/game/editor/layer_tiles.cpp')
| -rw-r--r-- | src/game/editor/layer_tiles.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/editor/layer_tiles.cpp b/src/game/editor/layer_tiles.cpp index eb78a23d..7532c1bd 100644 --- a/src/game/editor/layer_tiles.cpp +++ b/src/game/editor/layer_tiles.cpp @@ -363,7 +363,7 @@ void CLayerTiles::ShowInfo() int CLayerTiles::RenderProperties(CUIRect *pToolBox) { CUIRect Button; - + bool InGameGroup = !find_linear(m_pEditor->m_Map.m_pGameGroup->m_lLayers.all(), this).empty(); if(m_pEditor->m_Map.m_pGameLayer != this) { @@ -373,7 +373,7 @@ int CLayerTiles::RenderProperties(CUIRect *pToolBox) pToolBox->HSplitBottom(12.0f, pToolBox, &Button); if(m_pEditor->DoButton_Editor(&s_AutoMapperButton, "Auto map", 0, &Button, 0, "")) m_pEditor->PopupSelectConfigAutoMapInvoke(m_pEditor->UI()->MouseX(), m_pEditor->UI()->MouseY()); - + int Result = m_pEditor->PopupSelectConfigAutoMapResult(); if(Result > -1) { |