fn/scihunt
fn/scihunt
3
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity

Change FL_RESERVED1 to GF_MADNESS, move it from flags to gflags.

Browse source 
This was a bug! Glad it broke.
This commit is contained in:
Marco Cawthorne 2021-09-23 23:57:32 +02:00
parent 3cd5af1d19
commit bd4abcc299
Signed by: eukara
GPG key ID: C196CD8BA993248A
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/server/gamerules.qc
View file

@ -230,12 +230,12 @@ SHMultiplayerRules::PlayerPostFrame(base_player pp)
pl.sh_insaneactive = bound(0.0f, pl.sh_insaneactive - frametime, pl.sh_insaneactive); pl.sh_insaneactive = bound(0.0f, pl.sh_insaneactive - frametime, pl.sh_insaneactive);
if (pl.sh_insaneactive > 0.0f) if (pl.sh_insaneactive > 0.0f)
pl.flags |= FL_RESERVED1; pl.gflags |= GF_MADNESS;
else { else {
if (pl.flags & FL_RESERVED1) { if (pl.gflags & GF_MADNESS) {
bprint(PRINT_CHAT, sprintf("%s is no longer insane!\n", pl.netname)); bprint(PRINT_CHAT, sprintf("%s is no longer insane!\n", pl.netname));
} }
pl.flags &= ~FL_RESERVED1; pl.gflags &= ~GF_MADNESS;
} }
} }

3
src/shared/items.h
View file

@ -49,3 +49,6 @@
#define ITEM_UNUSED30 0x20000000 #define ITEM_UNUSED30 0x20000000
#define ITEM_UNUSED31 0x40000000 #define ITEM_UNUSED31 0x40000000
#define ITEM_UNUSED32 0x80000000 #define ITEM_UNUSED32 0x80000000
/* part of .gflags */
#define GF_MADNESS (1<<23)

6
src/shared/pmove.qc
View file

@ -14,6 +14,10 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* part of .gflags */
#define GF_MADNESS (1<<23)
#define PHY_JUMP_CHAINWINDOW 0.5 #define PHY_JUMP_CHAINWINDOW 0.5
#define PHY_JUMP_CHAIN 100 #define PHY_JUMP_CHAIN 100
#define PHY_JUMP_CHAINDECAY 50 #define PHY_JUMP_CHAINDECAY 50
@ -24,7 +28,7 @@
float float
GamePMove_Maxspeed(player target) GamePMove_Maxspeed(player target)
{ {
if (target.flags & FL_RESERVED1) if (target.gflags & GF_MADNESS)
return (target.flags & FL_CROUCHING) ? 135 : 500; return (target.flags & FL_CROUCHING) ? 135 : 500;
else else
return (target.flags & FL_CROUCHING) ? 135 : 270; return (target.flags & FL_CROUCHING) ? 135 : 270;