OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added a missing NULL pointer check to APlayerPawn::Tick.

Browse source 
- Fixed: The falling scream should not be played when the player is under
  water.


SVN r120 (trunk)
This commit is contained in:
Christoph Oelckers 2006-05-16 17:53:15 +00:00
commit 2ad91cc973
4 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/p_user.cpp
View file

@ -279,7 +279,7 @@ void APlayerPawn::Tick()
Super::Tick();
// Here's the place where crouching sprites should be handled
if (player->crouchfactor<FRACUNIT*3/4)
if (player != NULL && player->crouchfactor<FRACUNIT*3/4)
{
if (crouchsprite != 0)
{
@ -1425,8 +1425,9 @@ void P_PlayerThink (player_t *player)
P_PlayerInSpecialSector (player);
}
P_PlayerOnSpecialFlat (player, P_GetThingFloorType (player->mo));
if (player->mo->momz <= -35*FRACUNIT
&& player->mo->momz >= -40*FRACUNIT && !player->morphTics)
if (player->mo->momz <= -35*FRACUNIT &&
player->mo->momz >= -40*FRACUNIT && !player->morphTics &&
player->mo->waterlevel == 0)
{
int id = S_FindSkinnedSound (player->mo, "*falling");
if (id != 0 && !S_GetSoundPlayingInfo (player->mo, id))