[Stratagus-CVS] stratagus/src/action action_train.c

[Jimmy Salmon]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Jimmy Salmon <address@hidden>   03/11/09 00:40:22

Modified files:
        src/action     : action_train.c 

Log message:
        Removed ^Ms

Patches:
Index: stratagus/src/action/action_train.c
diff -u stratagus/src/action/action_train.c:1.59 
stratagus/src/action/action_train.c:1.60
--- stratagus/src/action/action_train.c:1.59    Sat Oct 18 12:35:19 2003
+++ stratagus/src/action/action_train.c Sun Nov  9 00:40:21 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: action_train.c,v 1.59 2003/10/18 16:35:19 jsalmon3 Exp $
+//     $Id: action_train.c,v 1.60 2003/11/09 05:40:21 jsalmon3 Exp $
 
 //@{
 
@@ -78,13 +78,13 @@
     }
     unit->Data.Train.Ticks += SpeedTrain;
     // FIXME: Should count down
-    if (unit->Data.Train.Ticks >=

+    if (unit->Data.Train.Ticks >=
            unit->Data.Train.What[0]->Stats[player->Player].Costs[TimeCost]) {
        //
        //      Check if there are still unit slots.
        //
        if (NumUnits >= UnitMax) {
-           unit->Data.Train.Ticks = 

+           unit->Data.Train.Ticks = 
                unit->Data.Train.What[0]->Stats[player->Player].Costs[TimeCost];
            unit->Reset = 1;
            unit->Wait = CYCLES_PER_SECOND / 6;
@@ -94,13 +94,13 @@
        //
        //      Check if enough food available.
        //
-       if ((food = !PlayerCheckFood(player, unit->Data.Train.What[0])) ||

+       if ((food = !PlayerCheckFood(player, unit->Data.Train.What[0])) ||
                !PlayerCheckLimits(player, unit->Data.Train.What[0])) {
            if (food && unit->Player->Ai) {
                AiNeedMoreFarms(unit, unit->Orders[0].Type);
            }
 
-           unit->Data.Train.Ticks = 

+           unit->Data.Train.Ticks = 
                unit->Data.Train.What[0]->Stats[player->Player].Costs[TimeCost];
            unit->Reset = 1;
            unit->Wait = CYCLES_PER_SECOND / 6;
@@ -150,11 +150,11 @@
        //
        //      FIXME: we must check if the units supports the new order.
        //
-       if ((unit->NewOrder.Action == UnitActionResource &&

-                   !nunit->Type->Harvester) ||

-               (unit->NewOrder.Action == UnitActionAttack &&

-                   !nunit->Type->CanAttack) ||

-               (unit->NewOrder.Action == UnitActionBoard &&

+       if ((unit->NewOrder.Action == UnitActionResource &&
+                   !nunit->Type->Harvester) ||
+               (unit->NewOrder.Action == UnitActionAttack &&
+                   !nunit->Type->CanAttack) ||
+               (unit->NewOrder.Action == UnitActionBoard &&
                    nunit->Type->UnitType != UnitTypeLand)) {
            DebugLevel0Fn("Wrong order for unit\n");