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

Fix lassat crash where its target would not be updated. Turn some asserts 

for AI building defense buildings in the wrong place into log messages. Fix
those more properly later!


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2098 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2007-07-14 18:01:12 +00:00
parent 5f0a762669
commit a31285a651
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/structure.c
View File

@ -1725,13 +1725,15 @@ STRUCTURE* buildStructure(STRUCTURE_STATS* pStructureType, UDWORD x, UDWORD y, U
if(((x >> TILE_SHIFT) < TOO_NEAR_EDGE) || ((x >> TILE_SHIFT) > ( if(((x >> TILE_SHIFT) < TOO_NEAR_EDGE) || ((x >> TILE_SHIFT) > (
mapWidth - TOO_NEAR_EDGE))) mapWidth - TOO_NEAR_EDGE)))
{ {
ASSERT(!"attempting to build too closely to map-edge", "buildStructure: x coord (%u) too near edge (req. distance is %u)", x, TOO_NEAR_EDGE); debug(LOG_ERROR, "buildStructure: attempting to build too closely to map-edge, "
"x coord (%u) too near edge (req. distance is %u)", x, TOO_NEAR_EDGE);
return NULL; return NULL;
} }
if(((y >> TILE_SHIFT) < TOO_NEAR_EDGE) || ((y >> TILE_SHIFT) > ( if(((y >> TILE_SHIFT) < TOO_NEAR_EDGE) || ((y >> TILE_SHIFT) > (
mapHeight - TOO_NEAR_EDGE))) mapHeight - TOO_NEAR_EDGE)))
{ {
ASSERT(!"attempting to build too closely to map-edge", "buildStructure: y coord (%u) too near edge (req. distance is %u)", y, TOO_NEAR_EDGE); debug(LOG_ERROR, "buildStructure: attempting to build too closely to map-edge, "
"y coord (%u) too near edge (req. distance is %u)", y, TOO_NEAR_EDGE);
return NULL; return NULL;
} }
@ -1812,13 +1814,15 @@ STRUCTURE* buildStructure(STRUCTURE_STATS* pStructureType, UDWORD x, UDWORD y, U
} }
} }
// end of dodgy stuff // end of dodgy stuff
else else if (TILE_HAS_STRUCTURE(psTile))
{ {
ASSERT(!(TILE_HAS_STRUCTURE(psTile)), debug(LOG_ERROR,
"buildStructure: building %s at (%d, %d) but found %s already at (%d, %d)", "buildStructure: building %s at (%d, %d) but found %s already at (%d, %d)",
pStructureType->pName, mapX, mapY, pStructureType->pName, mapX, mapY,
getTileStructure(mapX + width, mapY + breadth)->pStructureType->pName, getTileStructure(mapX + width, mapY + breadth)->pStructureType->pName,
mapX + width, mapY + breadth); mapX + width, mapY + breadth);
free(psBuilding);
return NULL;
} }
psTile->psObject = (BASE_OBJECT*)psBuilding; psTile->psObject = (BASE_OBJECT*)psBuilding;
@ -2975,21 +2979,11 @@ static void aiUpdateStructure(STRUCTURE *psStructure)
CHECK_STRUCTURE(psStructure); CHECK_STRUCTURE(psStructure);
if (psStructure->numWeaps > 0) for (i = 0; i < DROID_MAXWEAPS; i++)
{ {
for (i = 0;i < psStructure->numWeaps;i++) if (psStructure->psTarget[i] && psStructure->psTarget[i]->died)
{ {
if (psStructure->psTarget[i] && psStructure->psTarget[i]->died) setStructureTarget(psStructure, NULL, i);
{
setStructureTarget(psStructure, NULL, i);
}
}
}
else
{
if (psStructure->psTarget[0] && psStructure->psTarget[0]->died)
{
setStructureTarget(psStructure, NULL, 0);
} }
} }