diff options
| author | Alexandre <cytral@localhost.localdomain> | 2011-08-14 21:16:19 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-08-15 18:07:09 +0200 |
| commit | de5eccef3f18b2a3e2fbe746be559d0a7f078d27 (patch) | |
| tree | 62204248245d668d23bfe9e3c7853c0855249645 /src | |
| parent | 367bb4b8372dd8c19445c599df3b30ac6aed04d9 (diff) | |
| download | zcatch-de5eccef3f18b2a3e2fbe746be559d0a7f078d27.tar.gz zcatch-de5eccef3f18b2a3e2fbe746be559d0a7f078d27.zip | |
Fix Stuffs & clean comments
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/editor/editor.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/game/editor/editor.cpp b/src/game/editor/editor.cpp index 9280cb5f..31405892 100644 --- a/src/game/editor/editor.cpp +++ b/src/game/editor/editor.cpp @@ -820,6 +820,7 @@ void CEditor::DoToolbar(CUIRect ToolBar) (Input()->KeyDown('i') && (Input()->KeyPressed(KEY_LCTRL) || Input()->KeyPressed(KEY_RCTRL)))) { m_ShowTileInfo = !m_ShowTileInfo; + m_ShowEnvelopePreview = 0; } TB_Top.VSplitLeft(15.0f, 0, &TB_Top); @@ -1390,8 +1391,7 @@ void CEditor::DoQuadPoint(CQuad *pQuad, int QuadIndex, int V) IGraphics::CQuadItem QuadItem(px, py, 5.0f*m_WorldZoom, 5.0f*m_WorldZoom); Graphics()->QuadsDraw(&QuadItem, 1); } - -//H-Client + void CEditor::DoQuadEnvelopes(CQuad *q, int Index, int texID) { CEnvelope *pEnvelope = 0x0; @@ -1862,8 +1862,9 @@ void CEditor::DoMapEditor(CUIRect View, CUIRect ToolBar) if(pEditLayers[k]->m_Type == LAYERTYPE_QUADS) { CLayerQuads *pLayer = (CLayerQuads *)pEditLayers[k]; - - m_ShowEnvelopePreview = 2; + + if (!m_ShowEnvelopePreview) + m_ShowEnvelopePreview = 2; Graphics()->TextureSet(-1); Graphics()->QuadsBegin(); @@ -3353,7 +3354,8 @@ void CEditor::RenderEnvelopeEditor(CUIRect View) pEnvelope->m_lPoints[i].m_aValues[c] -= f2fx(m_MouseDeltaY*ValueScale); } - m_SelectedQuadEnvelope = m_SelectedEnvelope; + m_SelectedQuadEnvelope = m_SelectedEnvelope; + m_ShowEnvelopePreview = 1; m_SelectedEnvelopeChannel = i; m_Map.m_Modified = true; } |