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

Remove some unused stuff 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3821 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2008-02-17 16:36:54 +00:00
parent fb12b834a1
commit f74715f1d5
3 changed files with 15 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/droiddef.h
View File

@ -215,7 +215,6 @@ typedef struct _droid
/* Movement control data */
MOVE_CONTROL sMove;
// void *lastTile;
/* anim data */
ANIM_OBJECT *psCurAnim;

49
src/mission.c
View File

@ -1149,8 +1149,6 @@ void placeLimboDroids(void)
ASSERT(worldOnMap(psDroid->pos.x,psDroid->pos.y), "limbo droid is not on the map");
psDroid->pos.z = map_Height(psDroid->pos.x, psDroid->pos.y);
updateDroidOrientation(psDroid);
//psDroid->lastTile = mapTile(map_coord(psDroid->pos.x),
// map_coord(psDroid->pos.y));
psDroid->selected = FALSE;
//this is mainly for VTOLs
setDroidBase(psDroid, NULL);
@ -3849,60 +3847,21 @@ void missionDestroyObjects(void)
void processPreviousCampDroids(void)
{
DROID *psDroid, *psNext;
//UDWORD droidX, droidY;
//BOOL bPlaced;
//see if any are left
// See if any are left
if (mission.apsDroidLists[selectedPlayer])
{
for (psDroid = mission.apsDroidLists[selectedPlayer]; psDroid != NULL;
psDroid = psNext)
for (psDroid = mission.apsDroidLists[selectedPlayer]; psDroid != NULL; psDroid = psNext)
{
psNext = psDroid->psNext;
//We want to kill off all droids now! - AB 27/01/99
//KILL OFF TRANSPORTER
//if (psDroid->droidType == DROID_TRANSPORTER)
{
// We want to kill off all droids now! - AB 27/01/99
// KILL OFF TRANSPORTER
if (droidRemove(psDroid, mission.apsDroidLists))
{
addDroid(psDroid, apsDroidLists);
vanishDroid(psDroid);
}
}
/*else
{
//remove out of stored list and add to current Droid list
if (droidRemove(psDroid, mission.apsDroidLists))
{
addDroid(psDroid, apsDroidLists);
//set the x/y
droidX = map_coord(getLandingX(psDroid->player));
droidY = map_coord(getLandingY(psDroid->player));
bPlaced = pickATileGen(&droidX, &droidY,LOOK_FOR_EMPTY_TILE,normalPAT);
if (!bPlaced)
{
ASSERT( FALSE, "processPreviousCampDroids: Unable to find a free location \
cancel to continue" );
vanishDroid(psDroid);
}
else
{
psDroid->pos.x = (UWORD)world_coord(droidX);
psDroid->pos.y = (UWORD)world_coord(droidY);
psDroid->pos.z = map_Height(psDroid->pos.x, psDroid->pos.y);
updateDroidOrientation(psDroid);
//psDroid->lastTile = mapTile(map_coord(psDroid->pos.x),
// map_coord(psDroid->pos.y));
psDroid->selected = FALSE;
psDroid->cluster = 0;
gridAddObject((BASE_OBJECT *)psDroid);
//initialise the movement data
initDroidMovement(psDroid);
}
}
}*/
}
}
}

5
src/visibility.c
View File

@ -61,11 +61,6 @@ static float visLevelIncAcc, visLevelDecAcc;
// integer amount to change visiblility this turn
static SDWORD visLevelInc, visLevelDec;
// percentage of power over which objects start to be visible
// UNUSED. What for? - Per
#define VIS_LEVEL_START 100
#define VIS_LEVEL_RANGE 60
// alexl's sensor range.
BOOL bDisplaySensorRange;