OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: Turning off follow mode with automap rotating enabled did not

Browse source 
function in an easy-to-understand manner.
- Fixed: D_AddWildFile() blindly assumed that all matches were files.
- Added back the dead player check to CheckIfExitIsGood(), but now it
  applies only if the next map is part of the same hub. Otherwise, you can
  still exit the map while dead.
- Removed the SpawnedPuff global variable and made it a return value from 
  P_LineAttack().
- Fixed: P_SpawnPuff() played sounds for temporary puffs.


SVN r739 (trunk)
This commit is contained in:
Randy Heit 2008-02-12 05:54:03 +00:00
commit e8e7cebe18
13 changed files with 121 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/p_map.cpp
View file

@ -2781,7 +2781,7 @@ static bool CheckForSpectral (FTraceResults &res)
return false;
}
void P_LineAttack (AActor *t1, angle_t angle, fixed_t distance,
AActor *P_LineAttack (AActor *t1, angle_t angle, fixed_t distance,
int pitch, int damage, FName damageType, const PClass *pufftype)
{
fixed_t vx, vy, vz, shootz;
@ -2826,11 +2826,11 @@ void P_LineAttack (AActor *t1, angle_t angle, fixed_t distance,
}
if (puffDefaults->flags3 & MF3_ALWAYSPUFF)
{ // Spawn the puff anyway
P_SpawnPuff (pufftype, trace.X, trace.Y, trace.Z, angle - ANG180, 2);
puff = P_SpawnPuff (pufftype, trace.X, trace.Y, trace.Z, angle - ANG180, 2);
}
else
{
return;
return NULL;
}
}
else
@ -2949,10 +2949,12 @@ void P_LineAttack (AActor *t1, angle_t angle, fixed_t distance,
if (killPuff && puff != NULL)
{
puff->Destroy();
puff = NULL;
}
return puff;
}
void P_LineAttack (AActor *t1, angle_t angle, fixed_t distance,
AActor *P_LineAttack (AActor *t1, angle_t angle, fixed_t distance,
int pitch, int damage, FName damageType, FName pufftype)
{
const PClass * type = PClass::FindClass(pufftype);
@ -2962,8 +2964,9 @@ void P_LineAttack (AActor *t1, angle_t angle, fixed_t distance,
}
else
{
P_LineAttack(t1, angle, distance, pitch, damage, damageType, type);
return P_LineAttack(t1, angle, distance, pitch, damage, damageType, type);
}
return NULL;
}
void P_TraceBleed (int damage, fixed_t x, fixed_t y, fixed_t z, AActor *actor, angle_t angle, int pitch)