thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update Spring Shells, add color modulo check

Browse source
This commit is contained in:
TehRealSalt 2019-09-23 06:29:30 -04:00
parent 594e1cb41a
commit bc7673f2da
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/info.c
View file

@ -4253,7 +4253,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
32, // reactiontime 32, // reactiontime
sfx_None, // attacksound sfx_None, // attacksound
S_NULL, // painstate S_NULL, // painstate
0, // painchance SKINCOLOR_TEA, // painchance
sfx_s3kb1, // painsound sfx_s3kb1, // painsound
S_NULL, // meleestate S_NULL, // meleestate
S_NULL, // missilestate S_NULL, // missilestate
@ -4264,7 +4264,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
24*FRACUNIT, // radius 24*FRACUNIT, // radius
40*FRACUNIT, // height 40*FRACUNIT, // height
0, // display offset 0, // display offset
13*FRACUNIT, // mass 15*FRACUNIT, // mass
0, // damage 0, // damage
sfx_None, // activesound sfx_None, // activesound
MF_ENEMY|MF_SPECIAL|MF_SHOOTABLE, // flags MF_ENEMY|MF_SPECIAL|MF_SHOOTABLE, // flags
@ -4280,7 +4280,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
32, // reactiontime 32, // reactiontime
sfx_None, // attacksound sfx_None, // attacksound
S_NULL, // painstate S_NULL, // painstate
0, // painchance SKINCOLOR_YELLOW, // painchance
sfx_s3kb1, // painsound sfx_s3kb1, // painsound
S_NULL, // meleestate S_NULL, // meleestate
S_NULL, // missilestate S_NULL, // missilestate
@ -4291,7 +4291,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
24*FRACUNIT, // radius 24*FRACUNIT, // radius
40*FRACUNIT, // height 40*FRACUNIT, // height
0, // display offset 0, // display offset
26*FRACUNIT, // mass 25*FRACUNIT, // mass
0, // damage 0, // damage
sfx_None, // activesound sfx_None, // activesound
MF_ENEMY|MF_SPECIAL|MF_SHOOTABLE, // flags MF_ENEMY|MF_SPECIAL|MF_SHOOTABLE, // flags

3
src/p_map.c
View file

@ -122,7 +122,7 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
const fixed_t vscale = mapobjectscale + (object->scale - mapobjectscale); const fixed_t vscale = mapobjectscale + (object->scale - mapobjectscale);
fixed_t vertispeed = spring->info->mass; fixed_t vertispeed = spring->info->mass;
fixed_t horizspeed = spring->info->damage; fixed_t horizspeed = spring->info->damage;
UINT8 starcolor = spring->info->painchance; UINT8 starcolor = (spring->info->painchance % MAXTRANSLATIONS);
fixed_t savemomx = 0; fixed_t savemomx = 0;
fixed_t savemomy = 0; fixed_t savemomy = 0;
@ -1207,6 +1207,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
//else if (tmz > thzh - sprarea && tmz < thzh) // Don't damage people springing up / down //else if (tmz > thzh - sprarea && tmz < thzh) // Don't damage people springing up / down
return true; return true;
} }
// missiles can hit other things // missiles can hit other things
if (tmthing->flags & MF_MISSILE || tmthing->type == MT_SHELL) if (tmthing->flags & MF_MISSILE || tmthing->type == MT_SHELL)
{ {

2
src/p_mobj.c
View file

@ -12064,7 +12064,7 @@ ML_NOCLIMB : Direction not controllable
{ {
if (mthing->options & MTF_AMBUSH) if (mthing->options & MTF_AMBUSH)
{ {
if (mobj->flags & MF_SPRING) if (mobj->flags & MF_SPRING && mobj->info->damage)
mobj->angle += ANGLE_22h; mobj->angle += ANGLE_22h;
if (mobj->flags & MF_NIGHTSITEM) if (mobj->flags & MF_NIGHTSITEM)