lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'hitbox-tweaks' into 'master'

Browse source 
Small hitbox tweaks

See merge request STJr/SRB2Internal!341
This commit is contained in:
toaster 2019-09-22 06:43:28 -04:00
parent 07120aeda4 f7ad5501e1
commit 753c1bcb50
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/info.c
View file

@ -6504,8 +6504,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate S_NULL, // xdeathstate
sfx_None, // deathsound sfx_None, // deathsound
0, // speed 0, // speed
8*FRACUNIT, // radius 16*FRACUNIT, // radius
16*FRACUNIT, // height 32*FRACUNIT, // height
0, // display offset 0, // display offset
100, // mass 100, // mass
1, // damage 1, // damage
@ -6585,8 +6585,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate S_NULL, // xdeathstate
sfx_ncitem, // deathsound sfx_ncitem, // deathsound
1, // speed 1, // speed
8*FRACUNIT, // radius 16*FRACUNIT, // radius
16*FRACUNIT, // height 30*FRACUNIT, // height
0, // display offset 0, // display offset
4, // mass 4, // mass
0, // damage 0, // damage

8
src/p_inter.c
View file

@ -1701,13 +1701,15 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
return; return;
if (mariomode) if (mariomode)
return; return;
if (special->state-states != S_EXTRALARGEBUBBLE)
return; // Don't grab the bubble during its spawn animation
else if (toucher->eflags & MFE_VERTICALFLIP) else if (toucher->eflags & MFE_VERTICALFLIP)
{ {
if (special->z+special->height < toucher->z + toucher->height / 3 if (special->z+special->height < toucher->z
|| special->z+special->height > toucher->z + (toucher->height*2/3)) || special->z+special->height > toucher->z + (toucher->height*2/3))
return; // Only go in the mouth return; // Only go in the mouth
} }
else if (special->z < toucher->z + toucher->height / 3 else if (special->z < toucher->z
|| special->z > toucher->z + (toucher->height*2/3)) || special->z > toucher->z + (toucher->height*2/3))
return; // Only go in the mouth return; // Only go in the mouth