- Added support for scaled textures to DCanvas::DrawTexture.
- Changed deh.MaxHealth use to be consistent with other source ports. - Added NULL pointer checks to APlayerPawn's state set functions. If these remove the player from the game a crash is the inevitable result. SVN r325 (trunk)
This commit is contained in:
parent
4999c3b4aa
commit
06630b0fee
6 changed files with 39 additions and 33 deletions
|
|
@ -838,18 +838,18 @@ void APlayerPawn::PlayIdle ()
|
|||
|
||||
void APlayerPawn::PlayRunning ()
|
||||
{
|
||||
if (state == SpawnState)
|
||||
if (InStateSequence(state, SpawnState) && SeeState != NULL)
|
||||
SetState (SeeState);
|
||||
}
|
||||
|
||||
void APlayerPawn::PlayAttacking ()
|
||||
{
|
||||
SetState (MissileState);
|
||||
if (MissileState != NULL) SetState (MissileState);
|
||||
}
|
||||
|
||||
void APlayerPawn::PlayAttacking2 ()
|
||||
{
|
||||
SetState (MeleeState);
|
||||
if (MeleeState != NULL) SetState (MeleeState);
|
||||
}
|
||||
|
||||
void APlayerPawn::ThrowPoisonBag ()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue