From 49a3ea2bdb4f4e4c9340652ac953c54017daf91c Mon Sep 17 00:00:00 2001 From: past-due <30942300+past-due@users.noreply.github.com> Date: Wed, 28 Jun 2023 12:34:50 -0400 Subject: [PATCH] Add const to WIDGET_CALLBACK context --- lib/widget/widgbase.h | 2 +- src/intdisplay.cpp | 2 +- src/intdisplay.h | 2 +- src/mission.cpp | 8 ++++---- src/transporter.cpp | 2 +- src/transporter.h | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/widget/widgbase.h b/lib/widget/widgbase.h index 141a9f2d81f..05d2608b35f 100644 --- a/lib/widget/widgbase.h +++ b/lib/widget/widgbase.h @@ -54,7 +54,7 @@ class ScrollBarWidget; typedef void (*WIDGET_DISPLAY)(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset); /* The optional user callback function */ -typedef void (*WIDGET_CALLBACK)(WIDGET *psWidget, W_CONTEXT *psContext); +typedef void (*WIDGET_CALLBACK)(WIDGET *psWidget, const W_CONTEXT *psContext); typedef void (*WIDGET_AUDIOCALLBACK)(int AudioID); /* The optional "calc layout" callback function, to support runtime layout recalculation */ diff --git a/src/intdisplay.cpp b/src/intdisplay.cpp index b2d5c36fbe3..e2f3f362144 100644 --- a/src/intdisplay.cpp +++ b/src/intdisplay.cpp @@ -1884,7 +1884,7 @@ static UWORD sliderMouseUnit(W_SLIDER *Slider) return posStops; } -void intUpdateQuantitySlider(WIDGET *psWidget, W_CONTEXT *psContext) +void intUpdateQuantitySlider(WIDGET *psWidget, const W_CONTEXT *psContext) { W_SLIDER *Slider = (W_SLIDER *)psWidget; diff --git a/src/intdisplay.h b/src/intdisplay.h index efda708a818..cb585600a1a 100644 --- a/src/intdisplay.h +++ b/src/intdisplay.h @@ -295,7 +295,7 @@ void drawRadarBlips(int radarX, int radarY, float pixSizeH, float pixSizeV, cons /*Displays the proximity messages blips over the world*/ void intDisplayProximityBlips(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset); -void intUpdateQuantitySlider(WIDGET *psWidget, W_CONTEXT *psContext); +void intUpdateQuantitySlider(WIDGET *psWidget, const W_CONTEXT *psContext); void intDisplayMissionClock(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset); diff --git a/src/mission.cpp b/src/mission.cpp index dc109a0567b..540fe8ed62c 100644 --- a/src/mission.cpp +++ b/src/mission.cpp @@ -167,9 +167,9 @@ static void saveMissionLimboData(); static void restoreMissionLimboData(); static void processMissionLimbo(); -static void intUpdateMissionTimer(WIDGET *psWidget, W_CONTEXT *psContext); +static void intUpdateMissionTimer(WIDGET *psWidget, const W_CONTEXT *psContext); static bool intAddMissionTimer(); -static void intUpdateTransporterTimer(WIDGET *psWidget, W_CONTEXT *psContext); +static void intUpdateTransporterTimer(WIDGET *psWidget, const W_CONTEXT *psContext); static void adjustMissionPower(); static void saveMissionPower(); static UDWORD getHomeLandingX(); @@ -1991,7 +1991,7 @@ static void fillTimeDisplay(W_LABEL &Label, UDWORD time, bool bHours) //update function for the mission timer -void intUpdateMissionTimer(WIDGET *psWidget, W_CONTEXT *psContext) +void intUpdateMissionTimer(WIDGET *psWidget, const W_CONTEXT *psContext) { W_LABEL *Label = (W_LABEL *)psWidget; UDWORD timeElapsed; @@ -2078,7 +2078,7 @@ void intUpdateMissionTimer(WIDGET *psWidget, W_CONTEXT *psContext) #define TRANSPORTER_REINFORCE_LEADIN 10*GAME_TICKS_PER_SEC //update function for the transporter timer -void intUpdateTransporterTimer(WIDGET *psWidget, W_CONTEXT *psContext) +void intUpdateTransporterTimer(WIDGET *psWidget, const W_CONTEXT *psContext) { W_LABEL *Label = (W_LABEL *)psWidget; DROID *psTransporter; diff --git a/src/transporter.cpp b/src/transporter.cpp index 3ad8f05489d..c0808e021e4 100644 --- a/src/transporter.cpp +++ b/src/transporter.cpp @@ -693,7 +693,7 @@ static void intSetTransCapacityLabel(W_LABEL &Label) } /*updates the capacity of the current Transporter*/ -void intUpdateTransCapacity(WIDGET *psWidget, W_CONTEXT *psContext) +void intUpdateTransCapacity(WIDGET *psWidget, const W_CONTEXT *psContext) { W_LABEL *Label = (W_LABEL *)psWidget; diff --git a/src/transporter.h b/src/transporter.h index f4c478bf464..7ea103c16b3 100644 --- a/src/transporter.h +++ b/src/transporter.h @@ -68,7 +68,7 @@ bool launchTransporter(DROID *psTransporter); have arrived - returns true when there*/ bool updateTransporter(DROID *psTransporter); -void intUpdateTransCapacity(WIDGET *psWidget, W_CONTEXT *psContext); +void intUpdateTransCapacity(WIDGET *psWidget, const W_CONTEXT *psContext); /* Remove the Transporter Launch widget from the screen*/ void intRemoveTransporterLaunch();