[Stratagus-CVS] stratagus/src clone/unit.c include/unittype.h u...

[Crestez Leonard]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Crestez Leonard <address@hidden>        03/10/28 16:56:16

Modified files:
        src/clone      : unit.c 
        src/include    : unittype.h 
        src/ui         : botpanel.c 

Log message:
        Fixed bug #6220 (ctrl-I problem)

Patches:
Index: stratagus/src/clone/unit.c
diff -u stratagus/src/clone/unit.c:1.320 stratagus/src/clone/unit.c:1.321
--- stratagus/src/clone/unit.c:1.320    Tue Oct 28 15:20:43 2003
+++ stratagus/src/clone/unit.c  Tue Oct 28 16:56:14 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: unit.c,v 1.320 2003/10/28 20:20:43 n0body Exp $
+//     $Id: unit.c,v 1.321 2003/10/28 21:56:14 n0body Exp $
 
 //@{
 
@@ -2651,7 +2651,7 @@
 
     for (i = 0; i < nunits; ++i) {
        unit = units[i];
-       if (unit->Type->Coward && !unit->Removed) {
+       if (unit->Type->Harvester && unit->Type->ResInfo && !unit->Removed) {
            if (unit->Orders[0].Action == UnitActionStill) {
                if (SelectNextUnit && !IsOnlySelected(unit)) {
                    return unit;
@@ -3743,7 +3743,7 @@
     int RunStart;
 
     CLprintf(file, "\n;;; -----------------------------------------\n");
-    CLprintf(file, ";;; MODULE: units $Id: unit.c,v 1.320 2003/10/28 20:20:43 
n0body Exp $\n\n");
+    CLprintf(file, ";;; MODULE: units $Id: unit.c,v 1.321 2003/10/28 21:56:14 
n0body Exp $\n\n");
 
     //
     // Local variables
Index: stratagus/src/include/unittype.h
diff -u stratagus/src/include/unittype.h:1.124 
stratagus/src/include/unittype.h:1.125
--- stratagus/src/include/unittype.h:1.124      Tue Oct 28 07:08:30 2003
+++ stratagus/src/include/unittype.h    Tue Oct 28 16:56:16 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: unittype.h,v 1.124 2003/10/28 12:08:30 n0body Exp $
+//     $Id: unittype.h,v 1.125 2003/10/28 21:56:16 n0body Exp $
 
 #ifndef __UNITTYPE_H__
 #define __UNITTYPE_H__
@@ -345,7 +345,6 @@
 **     UnitType::Harvester
 **
 **             Unit is a resource worker. Faster than examining ResInfo
-**
 **
 **     UnitType::ResInfo[::MaxCosts]
 **
Index: stratagus/src/ui/botpanel.c
diff -u stratagus/src/ui/botpanel.c:1.94 stratagus/src/ui/botpanel.c:1.95
--- stratagus/src/ui/botpanel.c:1.94    Tue Oct 28 15:20:45 2003
+++ stratagus/src/ui/botpanel.c Tue Oct 28 16:56:16 2003
@@ -27,7 +27,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: botpanel.c,v 1.94 2003/10/28 20:20:45 n0body Exp $
+//     $Id: botpanel.c,v 1.95 2003/10/28 21:56:16 n0body Exp $
 
 //@{
 
@@ -103,7 +103,7 @@
     char* cp;
 
     CLprintf(file, "\n;;; -----------------------------------------\n");
-    CLprintf(file, ";;; MODULE: buttons $Id: botpanel.c,v 1.94 2003/10/28 
20:20:45 n0body Exp $\n\n");
+    CLprintf(file, ";;; MODULE: buttons $Id: botpanel.c,v 1.95 2003/10/28 
21:56:16 n0body Exp $\n\n");
 
     for (i = 0; i < NumUnitButtons; ++i) {
        CLprintf(file, "(define-button 'pos %d 'level %d 'icon '%s\n",
@@ -284,6 +284,7 @@
        switch (action) {
            case ButtonSpellCast:
                ba->Value = SpellIdByIdent(value);
+               DebugCheck(ba->Value < 0);
                break;
            case ButtonTrain:
                ba->Value = UnitTypeIdByIdent(value);