diff options
| author | oy <Tom_Adams@web.de> | 2011-07-20 22:18:31 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-07-20 22:18:31 +0200 |
| commit | 6312a2d71ca35cd925602bf978ef7c9483d6f78f (patch) | |
| tree | ec23d05f5c3c84be5ce53b7aa1789d1def3a131c | |
| parent | 84e5c534322940a696d9a915829a5e69e5679a28 (diff) | |
| download | zcatch-6312a2d71ca35cd925602bf978ef7c9483d6f78f.tar.gz zcatch-6312a2d71ca35cd925602bf978ef7c9483d6f78f.zip | |
fixed few things in th editor
| -rw-r--r-- | src/game/editor/editor.cpp | 2 | ||||
| -rw-r--r-- | src/game/editor/popups.cpp | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/game/editor/editor.cpp b/src/game/editor/editor.cpp index 7453472a..500e600b 100644 --- a/src/game/editor/editor.cpp +++ b/src/game/editor/editor.cpp @@ -193,7 +193,7 @@ void CEditorImage::AnalyseTileFlags() void CEditor::EnvelopeEval(float TimeOffset, int Env, float *pChannels, void *pUser) { CEditor *pThis = (CEditor *)pUser; - if(Env < 0 || Env > pThis->m_Map.m_lEnvelopes.size()) + if(Env < 0 || Env >= pThis->m_Map.m_lEnvelopes.size()) { pChannels[0] = 0; pChannels[1] = 0; diff --git a/src/game/editor/popups.cpp b/src/game/editor/popups.cpp index d8b8a91e..f29ae7e2 100644 --- a/src/game/editor/popups.cpp +++ b/src/game/editor/popups.cpp @@ -177,7 +177,8 @@ int CEditor::PopupGroup(CEditor *pEditor, CUIRect View) static float s_Name = 0; pEditor->UI()->DoLabel(&Button, "Name:", 10.0f, -1, -1); Button.VSplitLeft(40.0f, 0, &Button); - pEditor->DoEditBox(&s_Name, &Button, pEditor->m_Map.m_lGroups[pEditor->m_SelectedGroup]->m_aName, sizeof(pEditor->m_Map.m_lGroups[pEditor->m_SelectedGroup]->m_aName), 10.0f, &s_Name); + if(pEditor->DoEditBox(&s_Name, &Button, pEditor->m_Map.m_lGroups[pEditor->m_SelectedGroup]->m_aName, sizeof(pEditor->m_Map.m_lGroups[pEditor->m_SelectedGroup]->m_aName), 10.0f, &s_Name)) + pEditor->m_Map.m_Modified = true; } enum @@ -264,7 +265,8 @@ int CEditor::PopupLayer(CEditor *pEditor, CUIRect View) static float s_Name = 0; pEditor->UI()->DoLabel(&Button, "Name:", 10.0f, -1, -1); Button.VSplitLeft(40.0f, 0, &Button); - pEditor->DoEditBox(&s_Name, &Button, pEditor->GetSelectedLayer(0)->m_aName, sizeof(pEditor->GetSelectedLayer(0)->m_aName), 10.0f, &s_Name); + if(pEditor->DoEditBox(&s_Name, &Button, pEditor->GetSelectedLayer(0)->m_aName, sizeof(pEditor->GetSelectedLayer(0)->m_aName), 10.0f, &s_Name)) + pEditor->m_Map.m_Modified = true; } View.HSplitBottom(10.0f, &View, 0); |