[Stratagus-CVS] stratagus data/ccl/human/buttons.ccl src/ui/bot...

[Crestez Leonard]

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

Modified files:
        data/ccl/human : buttons.ccl 
        src/ui         : botpanel.c 

Log message:
        Fix bad button def(commented out)

Patches:
Index: stratagus/data/ccl/human/buttons.ccl
diff -u stratagus/data/ccl/human/buttons.ccl:1.28 
stratagus/data/ccl/human/buttons.ccl:1.29
--- stratagus/data/ccl/human/buttons.ccl:1.28   Thu Oct 23 21:58:32 2003
+++ stratagus/data/ccl/human/buttons.ccl        Tue Oct 28 17:20:52 2003
@@ -26,7 +26,7 @@
 ;;      along with this program; if not, write to the Free Software
 ;;      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  
USA
 ;;
-;;     $Id: buttons.ccl,v 1.28 2003/10/24 01:58:32 n0body Exp $
+;;     $Id: buttons.ccl,v 1.29 2003/10/28 22:20:52 n0body Exp $
 
 ;;----------------------------------------------------------------------------
 ;;     Define unit-button.
@@ -156,14 +156,14 @@
 
 ;; paladin specific actions ---------------------------------------------------
 
-(if extensions
-(define-button 'pos 6 'level 0 'icon 'icon-heal
-  'action 'cast-spell 'value 'spell-area-healing
-  'allowed 'check-upgrade 'allow-arg '(upgrade-area-healing)
-  'key "l" 'hint "AREA HEA~!LING (per 1 HP)"
-  'for-unit '(unit-paladin unit-knight-rider 
-    unit-man-of-light))
-)
+;(if extensions
+;(define-button 'pos 6 'level 0 'icon 'icon-heal
+;  'action 'cast-spell 'value 'spell-area-healing
+;  'allowed 'check-upgrade 'allow-arg '(upgrade-area-healing)
+;  'key "l" 'hint "AREA HEA~!LING (per 1 HP)"
+;  'for-unit '(unit-paladin unit-knight-rider 
+;    unit-man-of-light))
+;)
 
 (define-button 'pos 7 'level 0 'icon 'icon-holy-vision
   'action 'cast-spell 'value 'spell-holy-vision
Index: stratagus/src/ui/botpanel.c
diff -u stratagus/src/ui/botpanel.c:1.95 stratagus/src/ui/botpanel.c:1.96
--- stratagus/src/ui/botpanel.c:1.95    Tue Oct 28 16:56:16 2003
+++ stratagus/src/ui/botpanel.c Tue Oct 28 17:20:53 2003
@@ -27,7 +27,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: botpanel.c,v 1.95 2003/10/28 21:56:16 n0body Exp $
+//     $Id: botpanel.c,v 1.96 2003/10/28 22:20:53 n0body Exp $
 
 //@{
 
@@ -103,7 +103,7 @@
     char* cp;
 
     CLprintf(file, "\n;;; -----------------------------------------\n");
-    CLprintf(file, ";;; MODULE: buttons $Id: botpanel.c,v 1.95 2003/10/28 
21:56:16 n0body Exp $\n\n");
+    CLprintf(file, ";;; MODULE: buttons $Id: botpanel.c,v 1.96 2003/10/28 
22:20:53 n0body Exp $\n\n");
 
     for (i = 0; i < NumUnitButtons; ++i) {
        CLprintf(file, "(define-button 'pos %d 'level %d 'icon '%s\n",
@@ -284,7 +284,12 @@
        switch (action) {
            case ButtonSpellCast:
                ba->Value = SpellIdByIdent(value);
-               DebugCheck(ba->Value < 0);
+#ifdef DEBUG
+               if (ba->Value < 0) {
+                   DebugLevel0("Spell %s does not exist?\n" _C_ value);
+                   DebugCheck(ba->Value < 0);
+               }
+#endif
                break;
            case ButtonTrain:
                ba->Value = UnitTypeIdByIdent(value);