stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-29 12:40:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

cvmem -> threshold, on MI's reccomendation (I NEVER SLEEP)

Browse source
This commit is contained in:
toasterbabe 2016-06-06 02:17:48 +01:00
parent 4b385eb7eb
commit 316cb9c24f
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/p_enemy.c
View file

@ -3376,7 +3376,7 @@ void A_ParticleSpawn(mobj_t *actor)
if (!actor->health) if (!actor->health)
return; return;
if ((actor->lastlook) && (actor->cvmem)) if ((actor->lastlook) && (actor->threshold))
{ {
for (i = 0; i < actor->lastlook; i++) for (i = 0; i < actor->lastlook; i++)
{ {
@ -3384,7 +3384,7 @@ void A_ParticleSpawn(mobj_t *actor)
actor->x + FixedMul(FixedMul(actor->friction, actor->scale), FINECOSINE(actor->angle>>ANGLETOFINESHIFT)), actor->x + FixedMul(FixedMul(actor->friction, actor->scale), FINECOSINE(actor->angle>>ANGLETOFINESHIFT)),
actor->y + FixedMul(FixedMul(actor->friction, actor->scale), FINESINE(actor->angle>>ANGLETOFINESHIFT)), actor->y + FixedMul(FixedMul(actor->friction, actor->scale), FINESINE(actor->angle>>ANGLETOFINESHIFT)),
actor->z, actor->z,
(mobjtype_t)actor->cvmem); (mobjtype_t)actor->threshold);
P_SetScale(spawn, actor->scale); P_SetScale(spawn, actor->scale);
spawn->momz = FixedMul(actor->movefactor, spawn->scale); spawn->momz = FixedMul(actor->movefactor, spawn->scale);
spawn->destscale = spawn->scale/100; spawn->destscale = spawn->scale/100;

2
src/p_mobj.c
View file

@ -9378,7 +9378,7 @@ ML_NOCLIMB : Direction not controllable
mobj->movecount = anglespeed*ANG1; mobj->movecount = anglespeed*ANG1;
mobj->health = time; mobj->health = time;
mobj->friction = radius; mobj->friction = radius;
mobj->cvmem = type; mobj->threshold = type;
break; break;
} }