teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 17:01:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- SW: Tidy up use of cl_nomeleeblur use within panel code.

Browse source
This commit is contained in:
Mitch Richters 2021-11-11 17:10:09 +11:00 committed by Christoph Oelckers
parent e491d15ff9
commit 5d07c768b2
1 changed files with 12 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
source/games/sw/src/panel.cpp
View file

@ -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;