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

Fix uninitialised variable in aiStructHasRange, making it random whether sensors were in range. 

This removes a warning in optimised builds.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9530 4a71c877-e1ca-e34f-864e-861f7616d084
master
Cyp 2010-01-27 11:36:24 +00:00 committed by Git SVN Gateway
parent 0d956bb81b
commit c597cba214
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ai.c
View File

@ -79,8 +79,7 @@ static BOOL aiStructHasRange(STRUCTURE *psStruct, BASE_OBJECT *psTarget, int wea
static BOOL aiDroidHasRange(DROID *psDroid, BASE_OBJECT *psTarget, int weapon_slot)
{
WEAPON_STATS *psWStats;
SDWORD xdiff, ydiff, longRange;
int32_t xdiff, ydiff, longRange;
if (psDroid->droidType == DROID_SENSOR)
{
@ -93,14 +92,12 @@ static BOOL aiDroidHasRange(DROID *psDroid, BASE_OBJECT *psTarget, int weapon_sl
}
else
{
psWStats = psDroid->asWeaps[weapon_slot].nStat + asWeaponStats;
xdiff = (SDWORD)psDroid->pos.x - (SDWORD)psTarget->pos.x;
ydiff = (SDWORD)psDroid->pos.y - (SDWORD)psTarget->pos.y;
WEAPON_STATS *psWStats = psDroid->asWeaps[weapon_slot].nStat + asWeaponStats;
longRange = proj_GetLongRange(psWStats);
}
xdiff = (SDWORD)psDroid->pos.x - (SDWORD)psTarget->pos.x;
ydiff = (SDWORD)psDroid->pos.y - (SDWORD)psTarget->pos.y;
if (xdiff*xdiff + ydiff*ydiff < longRange*longRange)
{
// in range