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

Removed units, can't get a move command. Training debuging removed

Browse source
This commit is contained in:
johns 2001-02-25 19:03:38 +00:00
parent d66ed1ee27
commit 2877db08a9
1 changed files with 20 additions and 18 deletions

38
src/action/command.cpp
View file

@ -285,22 +285,27 @@ global void CommandMove(Unit* unit,int x,int y,int flush)
}
);
if( unit->Type->Building ) {
// FIXME: should find a better way for pending commands.
command=&unit->PendCommand;
} else if( !(command=GetNextCommand(unit,flush)) ) {
return;
//
// Check if unit is still valid? (NETWORK!)
//
if( !unit->Removed ) {
if( unit->Type->Building ) {
// FIXME: should find a better way for pending commands.
command=&unit->PendCommand;
} else if( !(command=GetNextCommand(unit,flush)) ) {
return;
}
command->Action=UnitActionMove;
ResetPath(*command);
command->Data.Move.Goal=NoUnitP;
command->Data.Move.Range=0;
command->Data.Move.SX=unit->X;
command->Data.Move.SY=unit->Y;
command->Data.Move.DX=x;
command->Data.Move.DY=y;
}
command->Action=UnitActionMove;
ResetPath(*command);
command->Data.Move.Goal=NoUnitP;
command->Data.Move.Range=0;
command->Data.Move.SX=unit->X;
command->Data.Move.SY=unit->Y;
command->Data.Move.DX=x;
command->Data.Move.DY=y;
#endif
ClearSavedAction(unit);
}
@ -884,10 +889,7 @@ global void CommandCancelTraining(Unit* unit,int slot)
n=unit->Command.Data.Train.Count;
if( unit->Command.Action==UnitActionTrain && slot<n ) {
DebugLevel0Fn("Cancel %d of %d - ",slot,n);
PlayerAddUnitType(unit->Player,unit->Command.Data.Train.What[slot]);
DebugLevel0Fn("%d,%d,%d\n",unit->Player->Resources[GoldCost],
unit->Player->Resources[WoodCost],unit->Player->Resources[OilCost]);
if ( --n ) {
for( i = slot; i < n; i++ ) {