diff --git a/src/cluster.c b/src/cluster.c index dcdda08..ea8c825 100644 --- a/src/cluster.c +++ b/src/cluster.c @@ -184,7 +184,7 @@ void clustRemoveObject(BASE_OBJECT *psObj) // tell a droid to join a cluster -static void _clustAddDroid(DROID *psDroid, SDWORD cluster) +static void clustAddDroid(DROID *psDroid, SDWORD cluster) { DROID *psCurr; SDWORD xdiff, ydiff; @@ -213,19 +213,12 @@ static void _clustAddDroid(DROID *psDroid, SDWORD cluster) ydiff = (SDWORD)psDroid->pos.y - (SDWORD)psCurr->pos.y; if (xdiff*xdiff + ydiff*ydiff < CLUSTER_DIST*CLUSTER_DIST) { - _clustAddDroid(psCurr, cluster); + clustAddDroid(psCurr, cluster); } } } -static void clustAddDroid(DROID *psDroid, SDWORD cluster) -{ - _clustAddDroid(psDroid,cluster); -} - - - // tell the cluster system about a new droid void clustNewDroid(DROID *psDroid) { @@ -250,7 +243,7 @@ void clustNewDroid(DROID *psDroid) // tell a structure to join a cluster -static void _clustAddStruct(STRUCTURE *psStruct, SDWORD cluster) +static void clustAddStruct(STRUCTURE *psStruct, SDWORD cluster) { STRUCTURE *psCurr; SDWORD xdiff, ydiff; @@ -279,15 +272,11 @@ static void _clustAddStruct(STRUCTURE *psStruct, SDWORD cluster) ydiff = (SDWORD)psStruct->pos.y - (SDWORD)psCurr->pos.y; if (xdiff*xdiff + ydiff*ydiff < CLUSTER_DIST*CLUSTER_DIST) { - _clustAddStruct(psCurr, cluster); + clustAddStruct(psCurr, cluster); } } } -static void clustAddStruct(STRUCTURE *psStruct, SDWORD cluster) -{ - _clustAddStruct(psStruct,cluster); -} // tell the cluster system about a new structure void clustNewStruct(STRUCTURE *psStruct)