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

Check if the unit has weapons, before trying to see what weapons they have. 

Fixes ticket:523

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7487 4a71c877-e1ca-e34f-864e-861f7616d084
master
Buginator 2009-05-22 02:58:26 +00:00 committed by Git SVN Gateway
parent a6be776c5d
commit 7330a69a1c
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/droid.c
View File

@ -4537,6 +4537,7 @@ true if valid weapon*/
/* this will be buggy if the droid being checked has both AA weapon and non-AA weapon
Cannot think of a solution without adding additional return value atm.
*/
// FIXME: This routine is a mess
BOOL checkValidWeaponForProp(DROID_TEMPLATE *psTemplate)
{
PROPULSION_STATS *psPropStats;
@ -4544,7 +4545,16 @@ BOOL checkValidWeaponForProp(DROID_TEMPLATE *psTemplate)
//check propulsion stat for vtol
psPropStats = asPropulsionStats + psTemplate->asParts[COMP_PROPULSION];
ASSERT_OR_RETURN(false, psPropStats != NULL, "invalid propulsion stats pointer");
// if there are no weapons, then don't even bother continuing
if (psTemplate->numWeaps == 0)
{
return false;
}
// FIXME -- why are we checking vtolAttackRuns on non AIR units?
if (asPropulsionTypes[psPropStats->propulsionType].travel == AIR)
{
//check weapon stat for indirect
@ -4562,11 +4572,7 @@ BOOL checkValidWeaponForProp(DROID_TEMPLATE *psTemplate)
}
}
//also checks that there is only a weapon attached and no other system component
if (psTemplate->numWeaps == 0)
{
bValid = false;
}
//also checks that there is no other system component
if (psTemplate->asParts[COMP_BRAIN] != 0
&& asWeaponStats[psTemplate->asWeaps[0]].weaponSubClass != WSC_COMMAND)
{