- Fixed: Default flags for APlayerPawn and APlayerChunk were not defined.

SVN r343 (trunk)
This commit is contained in:
Christoph Oelckers 2006-09-30 22:28:38 +00:00
parent 299380f990
commit fa2fc3f4d7
2 changed files with 11 additions and 1 deletions

View file

@ -1,3 +1,7 @@
September 30, 2006 (Changes by Graf Zahl)
- Fixed: Default flags for APlayerPawn and APlayerChunk were not defined.
- Fixed: The PCD_GETPLAYERINFO case in p_acs.cpp was missing a break.
September 27, 2006 (Changes by Graf Zahl) September 27, 2006 (Changes by Graf Zahl)
- Fixed: Monsters should never target friends, even if the friendliness - Fixed: Monsters should never target friends, even if the friendliness
state has changed since the target has been acquired. state has changed since the target has been acquired.

View file

@ -373,6 +373,9 @@ BEGIN_STATELESS_DEFAULTS (APlayerPawn, Any, -1, 0)
PROP_Mass (100) PROP_Mass (100)
PROP_PainChance (255) PROP_PainChance (255)
PROP_SpeedFixed (1) PROP_SpeedFixed (1)
PROP_Flags (MF_SOLID|MF_SHOOTABLE|MF_DROPOFF|MF_PICKUP|MF_NOTDMATCH|MF_FRIENDLY)
PROP_Flags2 (MF2_SLIDE|MF2_PASSMOBJ|MF2_PUSHWALL|MF2_FLOORCLIP|MF2_WINDTHRUST)
PROP_Flags3 (MF3_NOBLOCKMONST)
// [GRB] // [GRB]
PROP_PlayerPawn_JumpZ (8*FRACUNIT) PROP_PlayerPawn_JumpZ (8*FRACUNIT)
PROP_PlayerPawn_ViewHeight (41*FRACUNIT) PROP_PlayerPawn_ViewHeight (41*FRACUNIT)
@ -385,7 +388,10 @@ BEGIN_STATELESS_DEFAULTS (APlayerPawn, Any, -1, 0)
PROP_PlayerPawn_MorphWeapon ("None") PROP_PlayerPawn_MorphWeapon ("None")
END_DEFAULTS END_DEFAULTS
IMPLEMENT_ABSTRACT_ACTOR (APlayerChunk) IMPLEMENT_STATELESS_ACTOR (APlayerChunk, Any, -1, 0)
PROP_Flags (MF_DROPOFF)
PROP_Flags2 (MF2_PASSMOBJ)
END_DEFAULTS
void APlayerPawn::Serialize (FArchive &arc) void APlayerPawn::Serialize (FArchive &arc)
{ {