diff options
| author | oy <Tom_Adams@web.de> | 2011-08-06 22:30:18 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-08-06 22:30:18 +0200 |
| commit | 5fc5b63dac8e52262398c47fc36646b8b305760d (patch) | |
| tree | cc6c56222929719ae3e5a2fc8d522dd7e0f96d6f /src/game/editor/layer_tiles.cpp | |
| parent | de05682d87429f99d42e74986032d9c26037eae5 (diff) | |
| download | zcatch-5fc5b63dac8e52262398c47fc36646b8b305760d.tar.gz zcatch-5fc5b63dac8e52262398c47fc36646b8b305760d.zip | |
just list the correct envelope types(colour/pos) when linking an envelope to a quad/tile layer
Diffstat (limited to 'src/game/editor/layer_tiles.cpp')
| -rw-r--r-- | src/game/editor/layer_tiles.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/game/editor/layer_tiles.cpp b/src/game/editor/layer_tiles.cpp index 5662613c..eb78a23d 100644 --- a/src/game/editor/layer_tiles.cpp +++ b/src/game/editor/layer_tiles.cpp @@ -473,7 +473,19 @@ int CLayerTiles::RenderProperties(CUIRect *pToolBox) m_Color.a = NewVal&0xff; } if(Prop == PROP_COLOR_ENV) - m_ColorEnv = clamp(NewVal-1, -1, m_pEditor->m_Map.m_lEnvelopes.size()-1); + { + int Index = clamp(NewVal-1, -1, m_pEditor->m_Map.m_lEnvelopes.size()-1); + int Step = (Index-m_ColorEnv)%2; + if(Step != 0) + { + for(; Index >= -1 && Index < m_pEditor->m_Map.m_lEnvelopes.size(); Index += Step) + if(Index == -1 || m_pEditor->m_Map.m_lEnvelopes[Index]->m_Channels == 4) + { + m_ColorEnv = Index; + break; + } + } + } if(Prop == PROP_COLOR_ENV_OFFSET) m_ColorEnvOffset = NewVal; |