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

Merge branch 'ptzcrash' into 'master'

Browse source 
Fix crash in new fireflower (resolves #305).

Closes #305

See merge request STJr/SRB2Internal!497
This commit is contained in:
MascaraSnake 2019-11-21 09:28:35 -05:00
parent d1d1098f7c 340e2e48f9
commit 3b2b8ab80f
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/p_user.c
View file

@ -4030,7 +4030,8 @@ static void P_DoFiring(player_t *player, ticcmd_t *cmd)
{ {
player->pflags |= PF_ATTACKDOWN; player->pflags |= PF_ATTACKDOWN;
mo = P_SpawnPlayerMissile(player->mo, MT_FIREBALL, 0); mo = P_SpawnPlayerMissile(player->mo, MT_FIREBALL, 0);
P_InstaThrust(mo, player->mo->angle, ((mo->info->speed>>FRACBITS)*player->mo->scale) + player->speed); if (mo)
P_InstaThrust(mo, player->mo->angle, ((mo->info->speed>>FRACBITS)*player->mo->scale) + player->speed);
S_StartSound(player->mo, sfx_mario7); S_StartSound(player->mo, sfx_mario7);
P_SetWeaponDelay(player, TICRATE); // Short delay between fireballs so you can't spam them everywhere P_SetWeaponDelay(player, TICRATE); // Short delay between fireballs so you can't spam them everywhere
return; return;
@ -4051,8 +4052,8 @@ static void P_DoFiring(player_t *player, ticcmd_t *cmd)
mo = P_SpawnPlayerMissile(player->mo, MT_THROWNBOUNCE, MF2_BOUNCERING); mo = P_SpawnPlayerMissile(player->mo, MT_THROWNBOUNCE, MF2_BOUNCERING);
if (mo) if (mo)
mo->fuse = 3*TICRATE; // Bounce Ring time mo->fuse = 3*TICRATE; // Bounce Ring time
} }
// Rail ring // Rail ring
else if (player->currentweapon == WEP_RAIL && player->powers[pw_railring]) else if (player->currentweapon == WEP_RAIL && player->powers[pw_railring])