OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: The StrifePlayer couldn't obtain his default inventory because

Browse source 
APlayerPawn::GiveDefaultInventory gave him some HexenArmor even though
  he doesn't need it.
- Added custom blood type properties to DECORATE.
- Converted Blood to DECORATE and made some minor changes to the code
  in preparation for custom blood types.
- Converted the bot helper things to DECORATE.
- Added damage type specific crash states.


SVN r395 (trunk)
This commit is contained in:
Christoph Oelckers 2006-11-29 10:03:35 +00:00
commit 0ba809234e
20 changed files with 337 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/thingdef_codeptr.cpp
View file

@ -1117,6 +1117,7 @@ void A_RailAttack (AActor * self)
int Color2=StateParameters[index+4];
bool Silent=!!EvalExpressionI (StateParameters[index+5], self);
float MaxDiff=EvalExpressionF (StateParameters[index+6], self);
ENamedName PuffTypeName=(ENamedName)StateParameters[index+7];
AWeapon * weapon=self->player->ReadyWeapon;
@ -1126,7 +1127,7 @@ void A_RailAttack (AActor * self)
if (!weapon->DepleteAmmo(weapon->bAltFire, true)) return; // out of ammo
}
P_RailAttack (self, Damage, Spawnofs_XY, Color1, Color2, MaxDiff, Silent);
P_RailAttack (self, Damage, Spawnofs_XY, Color1, Color2, MaxDiff, Silent, PuffTypeName);
}
//==========================================================================
@ -1150,6 +1151,7 @@ void A_CustomRailgun (AActor *actor)
bool Silent=!!EvalExpressionI (StateParameters[index+4], actor);
bool aim=!!EvalExpressionI (StateParameters[index+5], actor);
float MaxDiff=EvalExpressionF (StateParameters[index+6], actor);
ENamedName PuffTypeName=(ENamedName)StateParameters[index+7];
// [RH] Andy Baker's stealth monsters
if (actor->flags & MF_STEALTH)
@ -1183,7 +1185,7 @@ void A_CustomRailgun (AActor *actor)
}
}
P_RailAttack (actor, Damage, Spawnofs_XY, Color1, Color2, MaxDiff, Silent);
P_RailAttack (actor, Damage, Spawnofs_XY, Color1, Color2, MaxDiff, Silent, PuffTypeName);
}
//===========================================================================
@ -1298,7 +1300,7 @@ static void InitSpawnedItem(AActor *self, AActor *mo, INTBOOL transfer_translati
{
AActor * originator = self;
if (transfer_translation)
if (transfer_translation && !(mo->flags2 & MF2_DONTTRANSLATE))
{
mo->Translation = self->Translation;
}