OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: Changed initialization of Weapon.Kickback so that it is only done

Browse source 
for direct descendants of AWeapon and not for every weapon being defined.
- Changed parsing of actor names back to not use C-mode. This change breaks
  any definition that contain periods in their name and apparently there's
  more than anyone could expect. Also altered the parser to manually check
  for colons inside the parsed string so that placing spaces around them
  is no longer necessary.
- Fixed: Weapons could be picked up for ammo even if they gave none.
- Fixed: A_Beacon was missing a NULL pointer check for the beacon's owner.
- Fixed: The status bar tried to access CPlayer->camera without checking
  its validity. In spy mode there is a possibility that it is NULL.

SVN r237 (trunk)
This commit is contained in:
Christoph Oelckers 2006-07-03 09:07:56 +00:00
commit 43c1ec4a74
8 changed files with 65 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/g_strife/a_rebels.cpp
View file

@ -277,7 +277,6 @@ void A_Beacon (AActor *self)
{
AActor *owner = self->target;
ARebel *rebel;
int friendNum;
angle_t an;
rebel = Spawn<ARebel1> (self->x, self->y, ONFLOORZ);
@ -290,8 +289,6 @@ void A_Beacon (AActor *self)
self->flags &= ~MF_SPECIAL;
static_cast<AInventory *>(self)->DropTime = 0;
// Set up the new rebel.
friendNum = owner->player != NULL ? int(owner->player - players + 1) : 0;
rebel->FriendPlayer = friendNum;
rebel->threshold = 100;
rebel->target = NULL;
rebel->flags4 |= MF4_INCOMBAT;
@ -304,16 +301,15 @@ void A_Beacon (AActor *self)
{
// Rebels are the same color as their owner
rebel->Translation = owner->Translation;
rebel->FriendPlayer = owner->player != NULL ? int(owner->player - players + 1) : 0;
// Set the rebel's target to whatever last hurt the player, so long as it's not
// one of the player's other rebels.
if (owner->target != NULL &&
(!(owner->target->flags & MF_FRIENDLY) ||
owner->target->FriendPlayer == 0 ||
owner->target->FriendPlayer != friendNum))
if (owner->target != NULL && !rebel->IsFriend (owner->target))
{
rebel->target = owner->target;
}
}
rebel->SetState (rebel->SeeState);
rebel->angle = self->angle;
an = self->angle >> ANGLETOFINESHIFT;