Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes LaSat strikes again. 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6692 4a71c877-e1ca-e34f-864e-861f7616d084
master
Buginator 2009-02-22 17:44:58 +00:00
parent 5601741b95
commit 7aec5dd86a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/projectile.c
View File

@ -378,7 +378,7 @@ BOOL proj_SendProjectile(WEAPON *psWeap, BASE_OBJECT *psAttacker, int player, Ve
When we have been created by penetration (spawned from another projectile),
we shall live no longer than the original projectile may have lived
*/
if (psAttacker->type == OBJ_PROJECTILE)
if (psAttacker && psAttacker->type == OBJ_PROJECTILE)
{
PROJECTILE * psOldProjectile = (PROJECTILE*)psAttacker;
psProj->born = psOldProjectile->born;
@ -1333,7 +1333,8 @@ static void proj_ImpactFunc( PROJECTILE *psObj )
//Watermelon:uses a slightly different check for angle,
// since fragment of a project is from the explosion spot not from the projectile start position
impactSide = getHitSide(psObj, (BASE_OBJECT *)psCurrD);
// FIXME: This screws us! A droid *can* die in the function below!
// which means we can't send that info to other players since turnOffMultiMsg() is off!
relativeDamage = droidDamage(psCurrD, damage, psStats->weaponClass, psStats->weaponSubClass, impactSide);
turnOffMultiMsg(false); // multiplay msgs back on.