From 5d07c768b28232160dc49a84d4062e2bcc0c9bec Mon Sep 17 00:00:00 2001
From: Mitch Richters <mjr4077au@gmail.com>
Date: Thu, 11 Nov 2021 17:10:09 +1100
Subject: [PATCH] - SW: Tidy up use of `cl_nomeleeblur` use within panel code.

---
 source/games/sw/src/panel.cpp | 44 ++++++++++-------------------------
 1 file changed, 12 insertions(+), 32 deletions(-)

diff --git a/source/games/sw/src/panel.cpp b/source/games/sw/src/panel.cpp
index 45f8c7829..e787db0fc 100644
--- a/source/games/sw/src/panel.cpp
+++ b/source/games/sw/src/panel.cpp
@@ -789,6 +789,8 @@ SwordBlur(PANEL_SPRITEp psp)
 void
 SpawnSwordBlur(PANEL_SPRITEp psp)
 {
+    if (cl_nomeleeblur) return;
+
     PANEL_SPRITEp nsp;
     //PICITEMp pip;
 
@@ -1030,10 +1032,7 @@ pSwordPresent(PANEL_SPRITEp psp)
 void
 pSwordSlide(PANEL_SPRITEp psp)
 {
-    if (!cl_nomeleeblur)
-    {
-        SpawnSwordBlur(psp);
-    }
+    SpawnSwordBlur(psp);
 
     psp->backupcoords();
 
@@ -1046,10 +1045,7 @@ pSwordSlide(PANEL_SPRITEp psp)
 void
 pSwordSlideDown(PANEL_SPRITEp psp)
 {
-    if (!cl_nomeleeblur)
-    {
-        SpawnSwordBlur(psp);
-    }
+    SpawnSwordBlur(psp);
 
     auto ang = SwordAng + psp->ang + psp->PlayerP->SwordAng;
 
@@ -1096,10 +1092,7 @@ pSwordSlideDown(PANEL_SPRITEp psp)
 void
 pSwordSlideR(PANEL_SPRITEp psp)
 {
-    if (!cl_nomeleeblur)
-    {
-        SpawnSwordBlur(psp);
-    }
+    SpawnSwordBlur(psp);
 
     psp->backupcoords();
 
@@ -1112,10 +1105,7 @@ pSwordSlideR(PANEL_SPRITEp psp)
 void
 pSwordSlideDownR(PANEL_SPRITEp psp)
 {
-    if (!cl_nomeleeblur)
-    {
-        SpawnSwordBlur(psp);
-    }
+    SpawnSwordBlur(psp);
 
     auto ang = SwordAng + psp->ang - psp->PlayerP->SwordAng;
 
@@ -5730,6 +5720,8 @@ FistBlur(PANEL_SPRITEp psp)
 void
 SpawnFistBlur(PANEL_SPRITEp psp)
 {
+    if (cl_nomeleeblur) return;
+
     PANEL_SPRITEp nsp;
     //PICITEMp pip;
 
@@ -5991,10 +5983,7 @@ pFistPresent(PANEL_SPRITEp psp)
 void
 pFistSlide(PANEL_SPRITEp psp)
 {
-    if (!cl_nomeleeblur)
-    {
-        SpawnFistBlur(psp);
-    }
+    SpawnFistBlur(psp);
 
     //psp->backupx();
     psp->backupy();
@@ -6008,10 +5997,7 @@ pFistSlide(PANEL_SPRITEp psp)
 void
 pFistSlideDown(PANEL_SPRITEp psp)
 {
-    if (!cl_nomeleeblur)
-    {
-        SpawnFistBlur(psp);
-    }
+    SpawnFistBlur(psp);
 
     short vel = 3500;
     auto ang = FistAng + psp->ang + psp->PlayerP->FistAng;
@@ -6094,10 +6080,7 @@ pFistSlideDown(PANEL_SPRITEp psp)
 void
 pFistSlideR(PANEL_SPRITEp psp)
 {
-    if (!cl_nomeleeblur)
-    {
-        SpawnFistBlur(psp);
-    }
+    SpawnFistBlur(psp);
 
     //psp->backupx();
     psp->backupy();
@@ -6111,10 +6094,7 @@ pFistSlideR(PANEL_SPRITEp psp)
 void
 pFistSlideDownR(PANEL_SPRITEp psp)
 {
-    if (!cl_nomeleeblur)
-    {
-        SpawnFistBlur(psp);
-    }
+    SpawnFistBlur(psp);
 
     short vel = 3500;
     auto ang = FistAng + psp->ang + psp->PlayerP->FistAng;