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

move to target, if target is moving away

Browse source
This commit is contained in:
johns 2000-04-26 15:55:30 +00:00
parent 3f7946c5ec
commit cabd2740a4
1 changed files with 11 additions and 10 deletions

21
src/action/action_attack.cpp
View file

@ -116,6 +116,7 @@ local void MoveToTarget(Unit* unit)
//
#ifdef NEW_UNIT
if( (goal=unit->Command.Data.Move.Goal) ) {
// FIXME: Should be done by Action Move???????
if( goal->Destroyed ) {
DebugLevel0(__FUNCTION__": destroyed unit\n");
if( !--goal->Refs ) {
@ -202,6 +203,7 @@ local void MoveToTarget(Unit* unit)
}
unit->SubAction=1;
} else if( err ) {
unit->State=0;
unit->SubAction=0;
// Return to old task!
if( unit->Command.Action==UnitActionStill ) {
@ -249,6 +251,7 @@ local void AttackTarget(Unit* unit)
}
unit->Command.Data.Move.Goal=goal=NoUnitP;
} else if( !goal->HP || goal->Command.Action==UnitActionDie ) {
// FIXME: goal->Removed???
--goal->Refs;
unit->Command.Data.Move.Goal=goal=NoUnitP;
}
@ -280,12 +283,10 @@ local void AttackTarget(Unit* unit)
unit->Command.Data.Move.DX=goal->X;
unit->Command.Data.Move.DY=goal->Y;
unit->SubAction|=2;
if( !unit->Type->Tower ) {
UnitHeadingFromDeltaXY(unit,goal->X-unit->X,goal->Y-unit->Y);
}
} else
#else
if( !goal || !goal->HP || goal->Command.Action==UnitActionDie ) {
// FIXME: goal->Removed???
unit->State=0;
goal=AttackUnitsInReactRange(unit);
unit->Command.Data.Move.Goal=goal;
@ -298,10 +299,6 @@ local void AttackTarget(Unit* unit)
DebugLevel3("Unit in react range %Zd\n",UnitNumber(goal));
unit->Command.Data.Move.DX=goal->X;
unit->Command.Data.Move.DY=goal->Y;
if( !unit->Type->Tower ) {
UnitHeadingFromDeltaXY(unit
,goal->X-unit->X,goal->Y-unit->Y);
}
} else
#endif
@ -324,9 +321,6 @@ local void AttackTarget(Unit* unit)
unit->Command.Data.Move.Goal=goal=temp;
unit->Command.Data.Move.DX=goal->X;
unit->Command.Data.Move.DY=goal->Y;
if( !unit->Type->Tower ) {
UnitHeadingFromDeltaXY(unit,goal->X-unit->X,goal->Y-unit->Y);
}
}
}
@ -346,6 +340,13 @@ local void AttackTarget(Unit* unit)
unit->State=0;
unit->SubAction--;
}
//
// Turn always to target
//
if( !unit->Type->Tower && goal ) {
UnitHeadingFromDeltaXY(unit,goal->X-unit->X,goal->Y-unit->Y);
}
}
}