- Fixed: A_SpawnItem() should use CopyFriendliness().
- Fixed: AExplosiveBarrel should have MF2_MCROSS set. - Fixed: Passing 0 numrays to A_BFGSpray should default to 40. - Fixed: New A_JumpIfCloser() function. - Future-proofing: thingdef.cpp/FindState() allows the 2.1 names for SwitchingDecorations. - Fixed: ASwitchingDecoration declared itself as deriving from AActor instead of ASwitchableDecoration. - Fixed: AWeaponHolder::Serialize() did not call its supermethod. SVN r19 (trunk)
This commit is contained in:
parent
75d072c09a
commit
4acc8a6954
8 changed files with 44 additions and 28 deletions
|
|
@ -1338,6 +1338,7 @@ void A_FireBFG (AActor *actor)
|
|||
}
|
||||
|
||||
bool thebfugu;
|
||||
int EvalExpressionI (int id, AActor *self);
|
||||
//
|
||||
// A_BFGSpray
|
||||
// Spawn a BFG explosion on every monster in view
|
||||
|
|
@ -1356,8 +1357,8 @@ void A_BFGSpray (AActor *mo)
|
|||
if (index >= 0)
|
||||
{
|
||||
spraytype = TypeInfo::FindType ((const char *)StateParameters[index]);
|
||||
numrays = (int)StateParameters[index+1];
|
||||
if (numrays < 0)
|
||||
numrays = EvalExpressionI (StateParameters[index+1], mo);
|
||||
if (numrays <= 0)
|
||||
numrays = 40;
|
||||
}
|
||||
if (spraytype == NULL)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue