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

Fix bug #1483 - unbuilt structures and walls shouldn't confer visibility. 

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9536 4a71c877-e1ca-e34f-864e-861f7616d084
master
Guangcong Luo 2010-01-28 03:50:25 +00:00 committed by Git SVN Gateway
parent 21d38e3685
commit 850cc41653
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/structure.c
View File

@ -5935,6 +5935,8 @@ void buildingComplete(STRUCTURE *psBuilding)
psBuilding->currentBuildPts = (SWORD)psBuilding->pStructureType->buildPoints; psBuilding->currentBuildPts = (SWORD)psBuilding->pStructureType->buildPoints;
psBuilding->status = SS_BUILT; psBuilding->status = SS_BUILT;
visTilesUpdate((BASE_OBJECT *)psBuilding, rayTerrainCallback);
switch (psBuilding->pStructureType->type) switch (psBuilding->pStructureType->type)
{ {
case REF_POWER_GEN: case REF_POWER_GEN:

11
src/visibility.c
View File

@ -304,6 +304,17 @@ void visTilesUpdate(BASE_OBJECT *psObj, RAY_CALLBACK callback)
// Remove previous map visibility provided by object // Remove previous map visibility provided by object
visRemoveVisibility(psObj); visRemoveVisibility(psObj);
if (psObj->type == OBJ_STRUCTURE)
{
STRUCTURE * psStruct = (STRUCTURE *)psObj;
if (psStruct->status != SS_BUILT ||
psStruct->pStructureType->type == REF_WALL || psStruct->pStructureType->type == REF_WALLCORNER)
{
// unbuilt structures and walls do not confer visibility.
return;
}
}
// Do the whole circle in 80 steps // Do the whole circle in 80 steps
for (ray = 0; ray < NUM_RAYS; ray += NUM_RAYS / 80) for (ray = 0; ray < NUM_RAYS; ray += NUM_RAYS / 80)
{ {