stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-21 11:21:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix retracting spikes dealing typeless damage instead of spike damage.

Browse source
This commit is contained in:
spherallic 2021-11-27 16:19:04 +01:00
parent 1afb0c556a
commit 49e6e7a80f
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/info.c
View file

@ -7974,7 +7974,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
8*FRACUNIT, // radius 8*FRACUNIT, // radius
32*FRACUNIT, // height 32*FRACUNIT, // height
0, // display offset 0, // display offset
4, // mass DMG_SPIKE, // mass
0, // damage 0, // damage
sfx_None, // activesound sfx_None, // activesound
MF_NOBLOCKMAP|MF_SCENERY|MF_NOCLIPHEIGHT, // flags MF_NOBLOCKMAP|MF_SCENERY|MF_NOCLIPHEIGHT, // flags
@ -8001,7 +8001,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
16*FRACUNIT, // radius 16*FRACUNIT, // radius
14*FRACUNIT, // height 14*FRACUNIT, // height
0, // display offset 0, // display offset
4, // mass DMG_SPIKE, // mass
0, // damage 0, // damage
sfx_None, // activesound sfx_None, // activesound
MF_NOBLOCKMAP|MF_NOGRAVITY|MF_SCENERY|MF_NOCLIPHEIGHT|MF_PAPERCOLLISION, // flags MF_NOBLOCKMAP|MF_NOGRAVITY|MF_SCENERY|MF_NOCLIPHEIGHT|MF_PAPERCOLLISION, // flags

2
src/p_map.c
View file

@ -1156,7 +1156,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
else else
thing->z = tmthing->z + tmthing->height + FixedMul(FRACUNIT, tmthing->scale); thing->z = tmthing->z + tmthing->height + FixedMul(FRACUNIT, tmthing->scale);
if (thing->flags & MF_SHOOTABLE) if (thing->flags & MF_SHOOTABLE)
P_DamageMobj(thing, tmthing, tmthing, 1, 0); P_DamageMobj(thing, tmthing, tmthing, 1, DMG_SPIKE);
return true; return true;
} }