Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed bug in FOW when buildings under construction where destroyed.

Browse source
This commit is contained in:
mr-russ 2003-01-26 04:45:53 +00:00
parent 0a0c137db8
commit b2740ceaaa
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/action/action_build.cpp
View file

@ -189,11 +189,15 @@ global void HandleActionBuild(Unit* unit)
build=MakeUnit(type,unit->Player);
build->Constructed=1;
#ifdef NEW_FOW
build->CurrentSightRange=0;
#endif
PlaceUnit(build,x,y);
#ifdef NEW_FOW
build->CurrentSightRange=build->Type->TileWidth < build->Type->TileHeight
? build->Type->TileHeight : build->Type->TileWidth;
#endif
PlaceUnit(build,x,y);
/* Done by PlaceUnit now
#ifdef HIERARCHIC_PATHFINDER
PfHierMapChangedCallback (build->X, build->Y,
@ -245,7 +249,9 @@ global void HandleActionBuild(Unit* unit)
unit->Value=build->Value; // worker holding value while building
RemoveUnit(unit,build); // automaticly: CheckUnitToBeDrawn(unit)
// FIXME: Johns: should connect it to the building with ->Next?
#ifdef NEW_FOW
build->CurrentSightRange=0;
#endif
unit->X=x;
unit->Y=y;
unit->Orders[0].Action=UnitActionStill;
@ -284,9 +290,6 @@ global void HandleActionBuilded(Unit* unit)
PlayerAddCostsFactor(unit->Player,unit->Stats->Costs,
CancelBuildingCostsFactor);
// Cancel building
#ifdef NEW_FOW
unit->CurrentSightRange=0;
#endif
LetUnitDie(unit);
return;
}
@ -354,10 +357,7 @@ global void HandleActionBuilded(Unit* unit)
if ( unit->Type == UnitTypeOrcWall
|| unit->Type == UnitTypeHumanWall ) {
MapSetWall(unit->X, unit->Y, unit->Type == UnitTypeHumanWall);
#ifdef NEW_FOW
unit->CurrentSightRange=0;
#endif
RemoveUnit(unit,NULL);
RemoveUnit(unit,NULL);
UnitLost(unit);
UnitClearOrders(unit);
ReleaseUnit(unit);

8
src/unit/unit.cpp
View file

@ -627,9 +627,15 @@ global void RemoveUnit(Unit* unit, Unit* host)
unsigned flags;
#ifdef NEW_FOW
MapUnmarkSight(unit->Player,unit->X+unit->Type->TileWidth/2
if( unit->Removed ) {
MapUnmarkSight(unit->Player,unit->Next->X+unit->Next->Type->TileWidth/2
,unit->Next->Y+unit->Next->Type->TileHeight/2
,unit->CurrentSightRange);
} else {
MapUnmarkSight(unit->Player,unit->X+unit->Type->TileWidth/2
,unit->Y+unit->Type->TileHeight/2
,unit->CurrentSightRange);
}
if( host ) {
unit->CurrentSightRange=host->CurrentSightRange;
MapMarkSight(unit->Player,host->X+host->Type->TileWidth/2,