From 38de3d866c4ebf9d483b907496a659c7c162e5db Mon Sep 17 00:00:00 2001
From: AzaezelX <quillus@hotmail.com>
Date: Wed, 21 May 2025 11:02:31 -0500
Subject: [PATCH 1/2] fix a couple cases of old direct references use
 getBitmap(), not mBitmap

---
 Engine/source/gui/controls/guiAnimBitmapCtrl.cpp | 6 +++---
 Engine/source/gui/controls/guiBitmapBarCtrl.cpp  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Engine/source/gui/controls/guiAnimBitmapCtrl.cpp b/Engine/source/gui/controls/guiAnimBitmapCtrl.cpp
index e9d6d148b..b74ffde53 100644
--- a/Engine/source/gui/controls/guiAnimBitmapCtrl.cpp
+++ b/Engine/source/gui/controls/guiAnimBitmapCtrl.cpp
@@ -219,7 +219,7 @@ bool guiAnimBitmapCtrl::ptSetFrameRanges(void *object, const char *index, const
 
 void guiAnimBitmapCtrl::onRender(Point2I offset, const RectI &updateRect)
 {
-   if (mBitmap)
+   if (getBitmap())
    {
       if (mFrameTime->getElapsedMs() > 1000 / mFramesPerSec) //fps to msfp conversion
       {
@@ -278,7 +278,7 @@ void guiAnimBitmapCtrl::onRender(Point2I offset, const RectI &updateRect)
       GFX->getDrawUtil()->clearBitmapModulation();
       GFX->getDrawUtil()->setBitmapModulation(mColor);
 
-      GFXTextureObject* texture = mBitmap;
+      GFXTextureObject* texture = getBitmap();
 
       Point2I modifiedSRC = Point2I(texture->mBitmapSize.x / mAnimTexTiling.x, texture->mBitmapSize.y / mAnimTexTiling.y);
       RectI srcRegion;
@@ -292,7 +292,7 @@ void guiAnimBitmapCtrl::onRender(Point2I offset, const RectI &updateRect)
       GFX->getDrawUtil()->drawBitmapStretchSR(texture, updateRect, srcRegion, GFXBitmapFlip_None, GFXTextureFilterLinear, false);
    }
 
-   if (mProfile->mBorder || !mBitmap)
+   if (mProfile->mBorder || !getBitmap())
    {
       RectI rect(offset, getExtent());
       GFX->getDrawUtil()->drawRect(rect, mProfile->mBorderColor);
diff --git a/Engine/source/gui/controls/guiBitmapBarCtrl.cpp b/Engine/source/gui/controls/guiBitmapBarCtrl.cpp
index edf644204..4498fb8ff 100644
--- a/Engine/source/gui/controls/guiBitmapBarCtrl.cpp
+++ b/Engine/source/gui/controls/guiBitmapBarCtrl.cpp
@@ -56,12 +56,12 @@ void GuiBitmapBarCtrl::initPersistFields()
 
 void GuiBitmapBarCtrl::onRender(Point2I offset, const RectI &updateRect)
 {
-   if (mBitmap)
+   if (getBitmap())
    {
       GFX->getDrawUtil()->clearBitmapModulation();
       GFX->getDrawUtil()->setBitmapModulation(mColor);
       F32 pct = (mPercent / 100.0);
-      GFXTextureObject* texture = mBitmap;
+      GFXTextureObject* texture = getBitmap();
       Point2I modifiedSRC;
       modifiedSRC.x = mVertical ? (F32)texture->mBitmapSize.x : (F32)(texture->mBitmapSize.x*pct);
       modifiedSRC.y = mVertical ? (F32)(texture->mBitmapSize.y*pct) : (F32)texture->mBitmapSize.y;
@@ -92,7 +92,7 @@ void GuiBitmapBarCtrl::onRender(Point2I offset, const RectI &updateRect)
       GFX->getDrawUtil()->drawBitmapStretchSR(texture, destRegion, srcRegion, GFXBitmapFlip_None, GFXTextureFilterLinear, false);
    }
 
-   if (mProfile->mBorder || !mBitmap)
+   if (mProfile->mBorder || !getBitmap())
    {
       RectI rect(offset, getExtent());
       GFX->getDrawUtil()->drawRect(rect, mProfile->mBorderColor);

From 73af7f6c3e665b49554468c8e61f19c9b5c843c1 Mon Sep 17 00:00:00 2001
From: AzaezelX <quillus@hotmail.com>
Date: Wed, 21 May 2025 11:06:50 -0500
Subject: [PATCH 2/2] third case

---
 Engine/source/gui/game/guiIdleCamFadeBitmapCtrl.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Engine/source/gui/game/guiIdleCamFadeBitmapCtrl.cpp b/Engine/source/gui/game/guiIdleCamFadeBitmapCtrl.cpp
index b2fcbb16e..defb06e57 100644
--- a/Engine/source/gui/game/guiIdleCamFadeBitmapCtrl.cpp
+++ b/Engine/source/gui/game/guiIdleCamFadeBitmapCtrl.cpp
@@ -115,14 +115,14 @@ public:
       }
 
       ColorI color(255,255,255,alpha);
-      if (mBitmap)
+      if (getBitmap())
       {
          GFX->getDrawUtil()->setBitmapModulation(color);
 
          if(mWrap)
          {
 
-            GFXTextureObject* texture = mBitmap;
+            GFXTextureObject* texture = getBitmap();
             RectI srcRegion;
             RectI dstRegion;
             F32 xdone = ((F32)getExtent().x/(F32)texture->mBitmapSize.x)+1;
@@ -145,11 +145,11 @@ public:
          else
          {
             RectI rect(offset, getExtent());
-            GFX->getDrawUtil()->drawBitmapStretch(mBitmap, rect);
+            GFX->getDrawUtil()->drawBitmapStretch(getBitmap(), rect);
          }
       }
 
-      if (mProfile->mBorder || !mBitmap)
+      if (mProfile->mBorder || !getBitmap())
       {
          RectI rect(offset.x, offset.y, getExtent().x, getExtent().y);
          ColorI borderCol(mProfile->mBorderColor);