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

P_SetTarget fixes, added SPR_SHCK to hw_light.c

This commit is contained in:
lachwright 2019-09-27 02:13:02 +08:00
parent d5e0ac1450
commit 264c60fb70
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/hardware/hw_light.c
View File

@ -197,6 +197,7 @@ light_t *t_lspr[NUMSPRITES] =
&lspr[NOLIGHT], // SPR_EGGO &lspr[NOLIGHT], // SPR_EGGO
&lspr[NOLIGHT], // SPR_SEBH &lspr[NOLIGHT], // SPR_SEBH
&lspr[NOLIGHT], // SPR_FAKE &lspr[NOLIGHT], // SPR_FAKE
&lspr[NOLIGHT], // SPR_SHCK
// Boss 4 (Castle Eggman) // Boss 4 (Castle Eggman)
&lspr[NOLIGHT], // SPR_EGGP &lspr[NOLIGHT], // SPR_EGGP

6
src/p_enemy.c
View File

@ -8106,7 +8106,7 @@ void A_Boss3ShockThink(mobj_t *actor)
// Break the link if movements are too different // Break the link if movements are too different
if (FixedHypot(snext->momx - actor->momx, snext->momy - actor->momy) > 12*actor->scale) if (FixedHypot(snext->momx - actor->momx, snext->momy - actor->momy) > 12*actor->scale)
{ {
actor->hnext = NULL; P_SetTarget(&actor->hnext, NULL);
return; return;
} }
@ -8125,8 +8125,8 @@ void A_Boss3ShockThink(mobj_t *actor)
P_SetTarget(&snew->target, actor->target); P_SetTarget(&snew->target, actor->target);
snew->fuse = actor->fuse; snew->fuse = actor->fuse;
actor->hnext = snew; P_SetTarget(&actor->hnext, snew);
snew->hnext = snext; P_SetTarget(&snew->hnext, snext);
} }
} }
} }

4
src/p_mobj.c
View File

@ -4627,8 +4627,8 @@ static void P_Boss3Thinker(mobj_t *mobj)
else else
{ {
if (i == numtospawn - 1) if (i == numtospawn - 1)
shock->hnext = sfirst; P_SetTarget(&shock->hnext, sfirst);
sprev->hnext = shock; P_SetTarget(&sprev->hnext, shock);
} }
P_Thrust(shock, ang, shock->info->speed); P_Thrust(shock, ang, shock->info->speed);