edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-18 05:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8861 from ChillerDragon/pr_prompt_fix_last_disabled

Browse source 
Fix editor prompt suggesting disabled last action
This commit is contained in:
Dennis Felsing 2024-09-01 07:05:30 +00:00 committed by GitHub
parent 36f0bcc509 daad41fbd7
commit 7951136fab
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/game/editor/prompt.cpp
View file

@ -101,7 +101,7 @@ void CPrompt::OnRender(CUIRect _)
{
m_PromptSelectedIndex = 0;
m_vpFilteredPromptList.clear();
if(m_ResetFilterResults && m_pLastAction)
if(m_ResetFilterResults && m_pLastAction && !m_pLastAction->Disabled())
{
m_vpFilteredPromptList.push_back(m_pLastAction);
}
@ -160,7 +160,7 @@ void CPrompt::OnRender(CUIRect _)
{
if(m_PromptSelectedIndex >= 0)
{
const CQuickAction *pBtn = m_vpFilteredPromptList[m_PromptSelectedIndex];
CQuickAction *pBtn = m_vpFilteredPromptList[m_PromptSelectedIndex];
SetInactive();
pBtn->Call();
m_pLastAction = pBtn;

4
src/game/editor/prompt.h
View file

@ -10,10 +10,10 @@
class CPrompt : public CEditorComponent
{
bool m_ResetFilterResults = true;
const CQuickAction *m_pLastAction = nullptr;
CQuickAction *m_pLastAction = nullptr;
int m_PromptSelectedIndex = -1;
std::vector<const CQuickAction *> m_vpFilteredPromptList;
std::vector<CQuickAction *> m_vpFilteredPromptList;
std::vector<CQuickAction *> m_vQuickActions;
CLineInputBuffered<512> m_PromptInput;