zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 23:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Adjust VisibleToPlayerClass to accept multiple classes as well as work with inheritance.

Browse source 
SVN r3291 (trunk)
This commit is contained in:
Braden Obrzut 2011-09-10 04:24:40 +00:00
parent c013e72caa
commit faa122ede3
4 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/actor.h
View file

@ -820,9 +820,6 @@ public:
// [BB] If 0, everybody can see the actor, if > 0, only members of team (VisibleToTeam-1) can see it.
DWORD VisibleToTeam;
// [BB] If NAME_None, all players can see the actor, else only players whose playerclass name is VisibleToPlayerClass can see it.
FNameNoInit VisibleToPlayerClass;
int special1; // Special info
int special2; // Special info
int health;

1
src/info.h
View file

@ -210,6 +210,7 @@ struct FActorInfo
PainChanceList *PainChances;
PainFlashList *PainFlashes;
FPlayerColorSetMap *ColorSets;
TArray<const PClass *> VisibleToPlayerClass;
};
class FDoomEdMap

18
src/p_mobj.cpp
View file

@ -892,9 +892,21 @@ bool AActor::IsVisibleToPlayer() const
const player_t* pPlayer = players[consoleplayer].camera->player;
if ( ( VisibleToPlayerClass != NAME_None )
&& pPlayer && pPlayer->mo && ( VisibleToPlayerClass != pPlayer->mo->GetClass()->TypeName ) )
return false;
if(pPlayer && pPlayer->mo && GetClass()->ActorInfo->VisibleToPlayerClass.Size() > 0)
{
bool visible = false;
for(unsigned int i = 0;i < GetClass()->ActorInfo->VisibleToPlayerClass.Size();++i)
{
const PClass *cls = GetClass()->ActorInfo->VisibleToPlayerClass[i];
if(cls && pPlayer->mo->GetClass()->IsDescendantOf(cls))
{
visible = true;
break;
}
}
if(!visible)
return false;
}
// [BB] Passed all checks.
return true;

9
src/thingdef/thingdef_properties.cpp
View file

@ -1246,10 +1246,13 @@ DEFINE_PROPERTY(visibletoteam, I, Actor)
//==========================================================================
// [BB]
//==========================================================================
DEFINE_PROPERTY(visibletoplayerclass, S, Actor)
DEFINE_PROPERTY(visibletoplayerclass, S_s, Actor)
{
PROP_STRING_PARM(n, 0);
defaults->VisibleToPlayerClass = n;
for(unsigned int i = 0;i < PROP_PARM_COUNT;++i)
{
PROP_STRING_PARM(n, i);
info->VisibleToPlayerClass.Push(FindClassTentative(n, "PlayerPawn"));
}
}
//==========================================================================