mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-26 14:01:45 +00:00
SVN r1072 (trunk)
This commit is contained in:
parent
c4a1ca2ac8
commit
a5c52d8371
2 changed files with 12 additions and 4 deletions
|
@ -1,3 +1,7 @@
|
|||
July 15, 2008 (Changes by Graf Zahl)
|
||||
- Fixed: Strife's EntityBoss didn't copy friendliness information to the
|
||||
sub-entities.
|
||||
|
||||
July 12, 2008 (Changes by Graf Zahl)
|
||||
- Fixed: Friendly spectral monsters should be able to hurt unfriendly ones
|
||||
and vice versa.
|
||||
|
|
|
@ -326,7 +326,8 @@ void A_SpawnEntity (AActor *self)
|
|||
if (entity != NULL)
|
||||
{
|
||||
entity->angle = self->angle;
|
||||
entity->target = self->target;
|
||||
entity->CopyFriendliness(self, true);
|
||||
//entity->target = self->target;
|
||||
entity->momz = 5*FRACUNIT;
|
||||
}
|
||||
}
|
||||
|
@ -341,7 +342,8 @@ void A_SpawnSubEntities (AActor *selfa)
|
|||
an = self->angle >> ANGLETOFINESHIFT;
|
||||
second = Spawn<AEntitySecond> (self->SpawnX + FixedMul (secondRadius, finecosine[an]),
|
||||
self->SpawnY + FixedMul (secondRadius, finesine[an]), self->SpawnZ, ALLOW_REPLACE);
|
||||
second->target = self->target;
|
||||
second->CopyFriendliness(self, true);
|
||||
//second->target = self->target;
|
||||
A_FaceTarget (second);
|
||||
an = second->angle >> ANGLETOFINESHIFT;
|
||||
second->momx += FixedMul (finecosine[an], 320000);
|
||||
|
@ -350,7 +352,8 @@ void A_SpawnSubEntities (AActor *selfa)
|
|||
an = (self->angle + ANGLE_90) >> ANGLETOFINESHIFT;
|
||||
second = Spawn<AEntitySecond> (self->SpawnX + FixedMul (secondRadius, finecosine[an]),
|
||||
self->SpawnY + FixedMul (secondRadius, finesine[an]), self->SpawnZ, ALLOW_REPLACE);
|
||||
second->target = self->target;
|
||||
second->CopyFriendliness(self, true);
|
||||
//second->target = self->target;
|
||||
second->momx = FixedMul (secondRadius, finecosine[an]) << 2;
|
||||
second->momy = FixedMul (secondRadius, finesine[an]) << 2;
|
||||
A_FaceTarget (second);
|
||||
|
@ -358,7 +361,8 @@ void A_SpawnSubEntities (AActor *selfa)
|
|||
an = (self->angle - ANGLE_90) >> ANGLETOFINESHIFT;
|
||||
second = Spawn<AEntitySecond> (self->SpawnX + FixedMul (secondRadius, finecosine[an]),
|
||||
self->SpawnY + FixedMul (secondRadius, finesine[an]), self->SpawnZ, ALLOW_REPLACE);
|
||||
second->target = self->target;
|
||||
second->CopyFriendliness(self, true);
|
||||
//second->target = self->target;
|
||||
second->momx = FixedMul (secondRadius, finecosine[an]) << 2;
|
||||
second->momy = FixedMul (secondRadius, finesine[an]) << 2;
|
||||
A_FaceTarget (second);
|
||||
|
|
Loading…
Reference in a new issue