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

Removed bad DebugCheck, cleanup

Browse source
This commit is contained in:
jsalmon3 2003-10-18 15:35:19 +00:00
parent e6a2c7b92d
commit b5fe44c91b
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/action/action_train.cpp
View file

@ -83,7 +83,7 @@ global void HandleActionTrain(Unit* unit)
//
// Check if there are still unit slots.
//
if (NumUnits >= UnitMax ) {
if (NumUnits >= UnitMax) {
unit->Data.Train.Ticks =
unit->Data.Train.What[0]->Stats[player->Player].Costs[TimeCost];
unit->Reset = 1;
@ -107,7 +107,7 @@ global void HandleActionTrain(Unit* unit)
return;
}
nunit=MakeUnit(unit->Data.Train.What[0], player);
nunit = MakeUnit(unit->Data.Train.What[0], player);
nunit->X = unit->X;
nunit->Y = unit->Y;
type = unit->Type;

4
src/action/command.cpp
View file

@ -878,8 +878,6 @@ global void CommandTrainUnit(Unit* unit, UnitType* type,
// Not already training?
//
if (unit->Orders[0].Action != UnitActionTrain) {
DebugCheck(unit->Wait > 6);
if (unit->OrderCount == 2 && unit->Orders[1].Action == UnitActionTrain) {
DebugLevel0Fn("FIXME: not supported. Unit queue full!\n");
return;
@ -965,7 +963,7 @@ global void CommandCancelTraining(Unit* unit, int slot, const UnitType* type)
}
if (!slot) { // Canceled in work slot
unit->Data.Train.Ticks = 0;
unit->Wait = unit->Reset = 1; // immediately start next training
unit->Wait = unit->Reset = 1; // immediately start next training
}
unit->Data.Train.Count = n;
} else {

2
src/ui/menus.cpp
View file

@ -3280,7 +3280,7 @@ local void MultiPlayerInternetGame(void)
MetaServerInUse = 0;
MetaServerConnectError();
return;
}
}
MetaServerInUse = 1;
ProcessMenu("menu-internet-create-join-menu", 1);
if (GuiGameStarted) {