From 314a8e190491a14d3747bf0067784358429ed192 Mon Sep 17 00:00:00 2001 From: Artyom Shalkhakov Date: Thu, 6 Feb 2025 08:48:43 -0700 Subject: [PATCH] Fix compilation errors. --- neo/tools/imgui/particleeditor/ParticleEditor.cpp | 6 +++--- neo/tools/imgui/particleeditor/ParticleEditor.h | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/neo/tools/imgui/particleeditor/ParticleEditor.cpp b/neo/tools/imgui/particleeditor/ParticleEditor.cpp index 4c5f5867..755ed508 100644 --- a/neo/tools/imgui/particleeditor/ParticleEditor.cpp +++ b/neo/tools/imgui/particleeditor/ParticleEditor.cpp @@ -86,10 +86,10 @@ ParticleEditor& ParticleEditor::Instance() } ParticleEditor::ParticleEditor() - : colorDlg( "Color" ) + : fileSelection(0) + , colorDlg( "Color" ) , fadeColorDlg( "Fade Color" ) , entityColorDlg( "Entity Color" ) - , fileSelection(0) , materialDeclSelection(0) , shouldPopulate(false) { @@ -1185,7 +1185,7 @@ idParticleStage *ParticleEditor::GetCurStage() { idDeclParticle *idp = GetCurParticle(); int sel = listStagesSel; int index = listStagesItemData.First( sel ); - if ( idp == NULL || sel == LB_ERR || index >= idp->stages.Num() ) { + if ( idp == NULL || sel == -1 || index >= idp->stages.Num() ) { return NULL; } return idp->stages[index]; diff --git a/neo/tools/imgui/particleeditor/ParticleEditor.h b/neo/tools/imgui/particleeditor/ParticleEditor.h index 0faafdc1..64755984 100644 --- a/neo/tools/imgui/particleeditor/ParticleEditor.h +++ b/neo/tools/imgui/particleeditor/ParticleEditor.h @@ -135,7 +135,6 @@ protected: void OnBtnZup(); void OnBtnZdn(); void OnBtnDrop(); - //void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar); private: bool isShown;