From bbc3173629c8b5eb5b79474377f9f79a72ebb26b Mon Sep 17 00:00:00 2001 From: Marrub Date: Thu, 25 Jun 2015 09:47:37 -0400 Subject: [PATCH 1/4] yep --- src/p_pspr.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/p_pspr.cpp b/src/p_pspr.cpp index 63f3bc6486..4e8340c5d0 100644 --- a/src/p_pspr.cpp +++ b/src/p_pspr.cpp @@ -124,9 +124,9 @@ void P_SetPsprite (player_t *player, int position, FState *state, bool nofunctio if (sv_fastweapons >= 2 && position == ps_weapon) - psp->tics = state->ActionFunc == NULL? 0 : 1; + psp->tics = state->ActionFunc == NULL ? 0 : !(state->GetTics() == 0); else if (sv_fastweapons) - psp->tics = 1; // great for producing decals :) + psp->tics = !(state->GetTics() == 0); // great for producing decals :) else psp->tics = state->GetTics(); // could be 0 From 873ef3fea8e7b942e48ad19695ed6934605c3437 Mon Sep 17 00:00:00 2001 From: Marrub Date: Thu, 25 Jun 2015 10:15:40 -0400 Subject: [PATCH 2/4] that works better --- src/p_pspr.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/p_pspr.cpp b/src/p_pspr.cpp index 4e8340c5d0..abe7f73207 100644 --- a/src/p_pspr.cpp +++ b/src/p_pspr.cpp @@ -124,9 +124,18 @@ void P_SetPsprite (player_t *player, int position, FState *state, bool nofunctio if (sv_fastweapons >= 2 && position == ps_weapon) - psp->tics = state->ActionFunc == NULL ? 0 : !(state->GetTics() == 0); + { + if(state->ActionFunc == NULL) + { + psp->tics = 0; + } + else + { + psp->tics = (state->GetTics() != 0); + } + } else if (sv_fastweapons) - psp->tics = !(state->GetTics() == 0); // great for producing decals :) + psp->tics = (state->GetTics() != 0); // great for producing decals :) else psp->tics = state->GetTics(); // could be 0 From 4208993f226aa33e1b0905721e0799d9a505dc13 Mon Sep 17 00:00:00 2001 From: Marrub Date: Sat, 27 Jun 2015 08:26:48 -0400 Subject: [PATCH 3/4] use sv_fastweapons 3 and 4 instead --- src/p_pspr.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/p_pspr.cpp b/src/p_pspr.cpp index abe7f73207..414b414d57 100644 --- a/src/p_pspr.cpp +++ b/src/p_pspr.cpp @@ -123,7 +123,9 @@ void P_SetPsprite (player_t *player, int position, FState *state, bool nofunctio } - if (sv_fastweapons >= 2 && position == ps_weapon) + if (sv_fastweapons == 2 && position == ps_weapon) + psp->tics = state->ActionFunc == NULL ? 0 : 1; + else if (sv_fastweapons >= 4 && position == ps_weapon) { if(state->ActionFunc == NULL) { @@ -134,8 +136,10 @@ void P_SetPsprite (player_t *player, int position, FState *state, bool nofunctio psp->tics = (state->GetTics() != 0); } } + else if (sv_fastweapons == 3) + psp->tics = (state->GetTics() != 0); else if (sv_fastweapons) - psp->tics = (state->GetTics() != 0); // great for producing decals :) + psp->tics = 1; // great for producing decals :) else psp->tics = state->GetTics(); // could be 0 From 08e9d7553891dfb6b001b2de8332cd6d13bb1691 Mon Sep 17 00:00:00 2001 From: Marrub Date: Sat, 27 Jun 2015 15:00:31 -0400 Subject: [PATCH 4/4] removed sv_fastweapons 4 as it may cause issues --- src/p_pspr.cpp | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/p_pspr.cpp b/src/p_pspr.cpp index 414b414d57..7e36d22fe9 100644 --- a/src/p_pspr.cpp +++ b/src/p_pspr.cpp @@ -125,17 +125,6 @@ void P_SetPsprite (player_t *player, int position, FState *state, bool nofunctio if (sv_fastweapons == 2 && position == ps_weapon) psp->tics = state->ActionFunc == NULL ? 0 : 1; - else if (sv_fastweapons >= 4 && position == ps_weapon) - { - if(state->ActionFunc == NULL) - { - psp->tics = 0; - } - else - { - psp->tics = (state->GetTics() != 0); - } - } else if (sv_fastweapons == 3) psp->tics = (state->GetTics() != 0); else if (sv_fastweapons)