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

Fix possible mp crash in armed transporter code. Patch by me and Watermelon. 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1782 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2007-05-31 16:55:42 +00:00
parent 7355ad466f
commit 3900653046
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/action.c
View File

@ -777,7 +777,6 @@ static void actionUpdateTransporter( DROID *psDroid )
UBYTE i;
//this is a bit field
UBYTE num_weapons = 0;
DROID_OACTION_INFO *psTargets = {NULL};
//check if transporter has arrived
if (updateTransporter(psDroid))
@ -794,7 +793,6 @@ static void actionUpdateTransporter( DROID *psDroid )
psDroid->psActionTarget[0] = NULL;
}
//if (psDroid->numWeaps == 0)
/* Watermelon:if I am a multi-turret droid */
if (psDroid->numWeaps > 1)
{
@ -822,8 +820,7 @@ static void actionUpdateTransporter( DROID *psDroid )
}
}
/* check for weapon */
//if ( psDroid->numWeaps > 0 )
/* check for weapon */
for(i = 0;i < psDroid->numWeaps;i++)
{
if ( (num_weapons & (1 << (i+1))) )
@ -833,19 +830,11 @@ static void actionUpdateTransporter( DROID *psDroid )
(void)aiBestNearestTarget(psDroid, &psDroid->psActionTarget[i], i);
}
if ( psDroid->psActionTarget[i] != NULL )
{
psDroid->psActionTarget[i] = psTargets->objects[i];
if ( visibleObject((BASE_OBJECT*)psDroid, psDroid->psActionTarget[i]) )
{
/*if (actionTargetTurret((BASE_OBJECT*)psDroid, psDroid->psActionTarget,
&(psDroid->turretRotation), &(psDroid->turretPitch),
psDroid->turretRotRate, (SWORD)(psDroid->turretRotRate/2),
//asWeaponStats[psDroid->asWeaps->nStat].direct))
proj_Direct(&asWeaponStats[psDroid->asWeaps->nStat]),
TRUE))*/
if (actionTargetTurret((BASE_OBJECT*)psDroid, psTargets->objects[i],
if (actionTargetTurret((BASE_OBJECT*)psDroid, psDroid->psActionTarget[i],
&(psDroid->turretRotation[i]), &(psDroid->turretPitch[i]),
&asWeaponStats[psDroid->asWeaps[i].nStat],
TRUE,i))
@ -1629,7 +1618,7 @@ void actionUpdateDroid(DROID *psDroid)
case DACTION_VTOLATTACK:
//Watermelon:uses vtResult
if (psDroid->psActionTarget != NULL &&
if (psDroid->psActionTarget[0] != NULL &&
validTarget((BASE_OBJECT *)psDroid, psDroid->psActionTarget[0], 0))
{
//check if vtol that its armed