- SW: Move static function DoReloadStatus() into the class as private function

source/sw/src/sbar.cpp

@@ -65,22 +65,6 @@ static const short icons[] = {
     ID_PanelCaltrops,
 };
 
-static bool DoReloadStatus(char *reloadstate, int ammo)
-{
-    bool reloading = ammo == 0 && *reloadstate != 2;
-
-    if (ammo == 0 && *reloadstate == 0)
-    {
-        *reloadstate = 1;
-    }
-    if (ammo)
-    {
-        *reloadstate = 0;
-    }
-
-    return reloading;
-}
-
 class DSWStatusBar : public DBaseStatusBar
 {
     DHUDFont miniFont, numberFont;
@@ -719,6 +703,28 @@ private:
         }
     }
 
+    //---------------------------------------------------------------------------
+    //
+    // Used in DrawHUD2() for determining whether a reloadable weapon is reloading.
+    //
+    //---------------------------------------------------------------------------
+
+    bool DoReloadStatus(char *reloadstate, int ammo)
+    {
+        bool reloading = ammo == 0 && *reloadstate != 2;
+
+        if (ammo == 0 && *reloadstate == 0)
+        {
+            *reloadstate = 1;
+        }
+        else if (ammo)
+        {
+            *reloadstate = 0;
+        }
+
+        return reloading;
+    }
+
     //---------------------------------------------------------------------------
     //
     //