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

* Make gridObjRange const correct 

* Move commented out code into an #if 0 section (instead of /**/ comment)
 * Use function world_coord instead of manual multiplication by TILE_UNITS
 * Use the MAX macro to get the largest of two values (instead of manual comparison and selection of values)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5664 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2008-07-25 16:10:20 +00:00
parent e8e664f85a
commit 88f428e37d
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/mapgrid.c
View File

@ -60,7 +60,7 @@ static BOOL gridIntersect(SDWORD x1,SDWORD y1, SDWORD x2,SDWORD y2,
static void gridAddArrayObject(SDWORD x, SDWORD y, BASE_OBJECT *psObj);
static void gridRemoveArrayObject(SDWORD x, SDWORD y, BASE_OBJECT *psObj);
static void gridCompactArray(SDWORD x, SDWORD y);
static SDWORD gridObjRange(BASE_OBJECT *psObj);
static int gridObjRange(const BASE_OBJECT* psObj);
// initialise the grid system
BOOL gridInitialise(void)
@ -591,24 +591,23 @@ static BOOL gridIntersect(SDWORD x1,SDWORD y1, SDWORD x2,SDWORD y2,
}
}
// Get the range of effect of an object
static SDWORD gridObjRange(BASE_OBJECT *psObj)
static int gridObjRange(const BASE_OBJECT* psObj)
{
/* SDWORD range;
#if 0
SDWORD range;
switch (psObj->type)
{
case OBJ_DROID:
range = ((DROID *)psObj)->sensorRange;
range = ((const DROID *)psObj)->sensorRange;
break;
case OBJ_STRUCTURE:
range = ((STRUCTURE *)psObj)->sensorRange;
if (structCBSensor((STRUCTURE *)psObj) ||
structVTOLCBSensor((STRUCTURE *)psObj))
range = ((const STRUCTURE *)psObj)->sensorRange;
if (structCBSensor((STRUCTURE *)psObj)
|| structVTOLCBSensor((const STRUCTURE *)psObj))
{
range = MAP_MAXWIDTH > MAP_MAXHEIGHT ?
MAP_MAXWIDTH*TILE_UNITS : MAP_MAXHEIGHT*TILE_UNITS;
range = MAX(world_coord(MAP_MAXWIDTH), world_coord(MAP_MAXHEIGHT));
}
break;
case OBJ_FEATURE:
@ -624,7 +623,8 @@ static SDWORD gridObjRange(BASE_OBJECT *psObj)
range = NAYBOR_RANGE;
}
return range;*/
return range;
#endif
return (TILE_UNITS * 20);
return world_coord(20);
}