From c597cba2140d33c49a16e3dfb427e6027b2eddc3 Mon Sep 17 00:00:00 2001 From: Cyp Date: Wed, 27 Jan 2010 11:36:24 +0000 Subject: [PATCH] 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 --- src/ai.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/ai.c b/src/ai.c index 37635782c..832eb6f35 100644 --- a/src/ai.c +++ b/src/ai.c @@ -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