zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-25 05:31:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Changed: The monster refiring functions should use the same sight checking mode as the code that triggers

Browse source 
the attack.


SVN r2266 (trunk)
This commit is contained in:
Christoph Oelckers 2010-04-03 07:10:52 +00:00
parent 7da0badf3c
commit 6f9b035df8
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_doom/a_possessed.cpp
View file

@ -112,7 +112,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_CPosRefire)
if (!self->target if (!self->target
|| P_HitFriend (self) || P_HitFriend (self)
|| self->target->health <= 0 || self->target->health <= 0
|| !P_CheckSight (self, self->target, 0) ) || !P_CheckSight (self, self->target, SF_SEEPASTBLOCKEVERYTHING|SF_SEEPASTSHOOTABLELINES))
{ {
self->SetState (self->SeeState); self->SetState (self->SeeState);
} }

2
src/g_doom/a_spidermaster.cpp
View file

@ -22,7 +22,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_SpidRefire)
if (!self->target if (!self->target
|| P_HitFriend (self) || P_HitFriend (self)
|| self->target->health <= 0 || self->target->health <= 0
|| !P_CheckSight (self, self->target, 0) ) || !P_CheckSight (self, self->target, SF_SEEPASTBLOCKEVERYTHING|SF_SEEPASTSHOOTABLELINES))
{ {
self->SetState (self->SeeState); self->SetState (self->SeeState);
} }

2
src/g_strife/a_sentinel.cpp
View file

@ -79,7 +79,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_SentinelRefire)
{ {
if (self->target == NULL || if (self->target == NULL ||
self->target->health <= 0 || self->target->health <= 0 ||
!P_CheckSight (self, self->target) || !P_CheckSight (self, self->target, SF_SEEPASTBLOCKEVERYTHING|SF_SEEPASTSHOOTABLELINES) ||
P_HitFriend(self) || P_HitFriend(self) ||
pr_sentinelrefire() < 40) pr_sentinelrefire() < 40)
{ {

2
src/thingdef/thingdef_codeptr.cpp
View file

@ -2847,7 +2847,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_MonsterRefire)
if (!self->target if (!self->target
|| P_HitFriend (self) || P_HitFriend (self)
|| self->target->health <= 0 || self->target->health <= 0
|| !P_CheckSight (self, self->target, 0) ) || !P_CheckSight (self, self->target, SF_SEEPASTBLOCKEVERYTHING|SF_SEEPASTSHOOTABLELINES) )
{ {
ACTION_JUMP(jump); ACTION_JUMP(jump);
} }