From 2a837c48966ee5d5c0d269c94ec78a43e2be624c Mon Sep 17 00:00:00 2001 From: Eric Robinson Date: Tue, 17 Sep 2024 12:54:36 -0400 Subject: [PATCH] Fix erroneous rename --- Source/control.cpp | 6 +++--- Source/control.h | 4 ++-- Source/controls/touch/event_handlers.cpp | 2 +- Source/engine/render/scrollrt.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/control.cpp b/Source/control.cpp index 0e5cd5d8e3a..5cfdec301be 100644 --- a/Source/control.cpp +++ b/Source/control.cpp @@ -923,7 +923,7 @@ void InitMainPanel() static const uint16_t CharButtonsFrameWidths[9] { 95, 41, 41, 41, 41, 41, 41, 41, 41 }; pChrButtons = LoadCel("data\\charbut", CharButtonsFrameWidths); } - ResetMainMainPanelButtons(); + ResetMainPanelButtons(); if (!HeadlessMode) pDurIcons = LoadCel("items\\duricons", 32); for (bool &buttonEnabled : CharPanelButton) @@ -955,7 +955,7 @@ void DrawMainPanel(const Surface &out) DrawInfoBox(out); } -void DrawMainMainPanelButtons(const Surface &out) +void DrawMainPanelButtons(const Surface &out) { const Point mainPanelPosition = GetMainPanel().position; int totalButtons = IsChatAvailable() ? TotalMpMainPanelButtons : TotalSpMainPanelButtons; @@ -982,7 +982,7 @@ void DrawMainMainPanelButtons(const Surface &out) } } -void ResetMainMainPanelButtons() +void ResetMainPanelButtons() { for (bool &panelButton : MainPanelButtons) panelButton = false; diff --git a/Source/control.h b/Source/control.h index d772e6c716a..d99cddb86e4 100644 --- a/Source/control.h +++ b/Source/control.h @@ -134,12 +134,12 @@ void DrawMainPanel(const Surface &out); * Draws the control panel buttons in their current state. If the button is in the default * state draw it from the panel cel(extract its sub-rect). Else draw it from the buttons cel. */ -void DrawMainMainPanelButtons(const Surface &out); +void DrawMainPanelButtons(const Surface &out); /** * Clears panel button flags. */ -void ResetMainMainPanelButtons(); +void ResetMainPanelButtons(); /** * Checks if the mouse cursor is within any of the panel buttons and flag it if so. diff --git a/Source/controls/touch/event_handlers.cpp b/Source/controls/touch/event_handlers.cpp index 511ebcce526..a08f656ac53 100644 --- a/Source/controls/touch/event_handlers.cpp +++ b/Source/controls/touch/event_handlers.cpp @@ -93,7 +93,7 @@ void HandleBottomPanelInteraction(const SDL_Event &event) if (!gbRunGame || !MyPlayer->HoldItem.isEmpty()) return; - ResetMainMainPanelButtons(); + ResetMainPanelButtons(); if (event.type != SDL_FINGERUP) { SpellSelectFlag = true; diff --git a/Source/engine/render/scrollrt.cpp b/Source/engine/render/scrollrt.cpp index b9d022fe9d8..400d54f4dd5 100644 --- a/Source/engine/render/scrollrt.cpp +++ b/Source/engine/render/scrollrt.cpp @@ -1670,7 +1670,7 @@ void DrawAndBlit() DrawSpell(out); } if (drawControlButtons) { - DrawMainMainPanelButtons(out); + DrawMainPanelButtons(out); } if (drawBelt) { DrawInvBelt(out);