stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-18 07:22:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Sorry, MI. More info in forthcoming merge request.

Browse source
This commit is contained in:
toasterbabe 2017-07-17 23:58:54 +01:00
parent 0416981c1b
commit 66d59efddc
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/info.c
View file

@ -5992,7 +5992,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
{ // MT_WALLSPIKE
522, // doomednum
S_WALLSPIKE1, // spawnstate
S_WALLSPIKE1, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@ -6005,9 +6005,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // missilestate
S_NULL, // deathstate
S_NULL, // xdeathstate
sfx_None, // deathsound
sfx_None, // deathsound
2*TICRATE, // speed
32*FRACUNIT, // radius
16*FRACUNIT, // radius
14*FRACUNIT, // height
0, // display offset
4, // mass
@ -6019,7 +6019,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
{ // MT_WALLSPIKEBASE
-1, // doomednum
S_WALLSPIKEBASE, // spawnstate
S_WALLSPIKEBASE, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@ -6034,7 +6034,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate
sfx_None, // deathsound
0, // speed
7*FRACUNIT, // radius
FRACUNIT/4, // radius
14*FRACUNIT, // height
0, // display offset
4, // mass

2
src/p_mobj.c
View file

@ -10146,7 +10146,7 @@ ML_NOCLIMB : Direction not controllable
// spawn base
{
const angle_t mobjangle = FixedAngle(mthing->angle*FRACUNIT); // the mobj's own angle hasn't been set quite yet so...
const fixed_t baseradius = mobj->radius/2 - FixedMul(FRACUNIT, mobj->scale);
const fixed_t baseradius = mobj->radius - FixedMul(mobjinfo[MT_WALLSPIKEBASE].radius, mobj->scale);
mobj_t *base = P_SpawnMobj(
mobj->x - P_ReturnThrustX(mobj, mobjangle, baseradius),
mobj->y - P_ReturnThrustY(mobj, mobjangle, baseradius),