Merge branch 'ptzcrash' into 'master'
Fix crash in new fireflower (resolves #305). Closes #305 See merge request STJr/SRB2Internal!497
This commit is contained in:
commit
3b2b8ab80f
|
@ -4030,6 +4030,7 @@ static void P_DoFiring(player_t *player, ticcmd_t *cmd)
|
|||
{
|
||||
player->pflags |= PF_ATTACKDOWN;
|
||||
mo = P_SpawnPlayerMissile(player->mo, MT_FIREBALL, 0);
|
||||
if (mo)
|
||||
P_InstaThrust(mo, player->mo->angle, ((mo->info->speed>>FRACBITS)*player->mo->scale) + player->speed);
|
||||
S_StartSound(player->mo, sfx_mario7);
|
||||
P_SetWeaponDelay(player, TICRATE); // Short delay between fireballs so you can't spam them everywhere
|
||||
|
|
Loading…
Reference in a new issue