[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus/src action/action_train.c action/comm...
From: |
Jimmy Salmon |
Subject: |
[Stratagus-CVS] stratagus/src action/action_train.c action/comm... |
Date: |
Sat, 18 Oct 2003 12:35:19 -0400 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: Jimmy Salmon <address@hidden> 03/10/18 12:35:19
Modified files:
src/action : action_train.c command.c
src/ui : menus.c
Log message:
Removed bad DebugCheck, cleanup
Patches:
Index: stratagus/src/action/action_train.c
diff -u stratagus/src/action/action_train.c:1.58
stratagus/src/action/action_train.c:1.59
--- stratagus/src/action/action_train.c:1.58 Tue Oct 7 08:03:39 2003
+++ stratagus/src/action/action_train.c Sat Oct 18 12:35:19 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: action_train.c,v 1.58 2003/10/07 12:03:39 martinxyz Exp $
+// $Id: action_train.c,v 1.59 2003/10/18 16:35:19 jsalmon3 Exp $
//@{
@@ -83,7 +83,7 @@
//
// 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 @@
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;
Index: stratagus/src/action/command.c
diff -u stratagus/src/action/command.c:1.109
stratagus/src/action/command.c:1.110
--- stratagus/src/action/command.c:1.109 Fri Oct 17 02:04:30 2003
+++ stratagus/src/action/command.c Sat Oct 18 12:35:19 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: command.c,v 1.109 2003/10/17 06:04:30 mr-russ Exp $
+// $Id: command.c,v 1.110 2003/10/18 16:35:19 jsalmon3 Exp $
//@{
@@ -878,8 +878,6 @@
// 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 @@
}
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 {
Index: stratagus/src/ui/menus.c
diff -u stratagus/src/ui/menus.c:1.568 stratagus/src/ui/menus.c:1.569
--- stratagus/src/ui/menus.c:1.568 Fri Oct 17 21:13:50 2003
+++ stratagus/src/ui/menus.c Sat Oct 18 12:35:19 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: menus.c,v 1.568 2003/10/18 01:13:50 mohydine Exp $
+// $Id: menus.c,v 1.569 2003/10/18 16:35:19 jsalmon3 Exp $
//@{
@@ -3280,7 +3280,7 @@
MetaServerInUse = 0;
MetaServerConnectError();
return;
- }
+ }
MetaServerInUse = 1;
ProcessMenu("menu-internet-create-join-menu", 1);
if (GuiGameStarted) {
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] stratagus/src action/action_train.c action/comm...,
Jimmy Salmon <=