[Stratagus-CVS] stratagus/data/ccl buttons.ccl constructions.cc...

[Ingo Ruhnke]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Ingo Ruhnke <address@hidden>    03/08/02 09:37:06

Modified files:
        data/ccl       : buttons.ccl constructions.ccl menus.ccl 
                         sound.ccl stratagus.ccl ui.ccl units.ccl 
                         upgrade.ccl wc2.ccl 
Added files:
        data/ccl       : guile.ccl siod.ccl 

Log message:
        - added optional guile support

Patches:
Index: stratagus/data/ccl/buttons.ccl
diff -u stratagus/data/ccl/buttons.ccl:1.9 stratagus/data/ccl/buttons.ccl:1.10
--- stratagus/data/ccl/buttons.ccl:1.9  Thu Jul  3 13:30:01 2003
+++ stratagus/data/ccl/buttons.ccl      Sat Aug  2 09:37:06 2003
@@ -26,12 +26,12 @@
 ;;      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.9 2003/07/03 17:30:01 ingo Exp $
+;;     $Id: buttons.ccl,v 1.10 2003/08/02 13:37:06 grumbel Exp $
 
 ;; Load the buttons of all races
 
-(load "ccl/human/buttons.ccl" #f #t)
-(load "ccl/orc/buttons.ccl" #f #t)
+(ccl:load "ccl/human/buttons.ccl")
+(ccl:load "ccl/orc/buttons.ccl")
 
 ;;----------------------------------------------------------------------------
 ;;     Define unit-button.
Index: stratagus/data/ccl/constructions.ccl
diff -u stratagus/data/ccl/constructions.ccl:1.8 
stratagus/data/ccl/constructions.ccl:1.9
--- stratagus/data/ccl/constructions.ccl:1.8    Fri Jul 11 14:27:04 2003
+++ stratagus/data/ccl/constructions.ccl        Sat Aug  2 09:37:06 2003
@@ -26,10 +26,10 @@
 ;;      along with this program; if not, write to the Free Software
 ;;      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  
USA
 ;;
-;;     $Id: constructions.ccl,v 1.8 2003/07/11 18:27:04 grumbel Exp $
+;;     $Id: constructions.ccl,v 1.9 2003/08/02 13:37:06 grumbel Exp $
 
-(load "ccl/human/constructions.ccl" #f #t)
-(load "ccl/orc/constructions.ccl" #f #t)
+(ccl:load "ccl/human/constructions.ccl")
+(ccl:load "ccl/orc/constructions.ccl")
 
 ;;=============================================================================
 ;;     Define a construction.
Index: stratagus/data/ccl/menus.ccl
diff -u stratagus/data/ccl/menus.ccl:1.88 stratagus/data/ccl/menus.ccl:1.89
--- stratagus/data/ccl/menus.ccl:1.88   Fri Jul 11 14:27:04 2003
+++ stratagus/data/ccl/menus.ccl        Sat Aug  2 09:37:06 2003
@@ -26,12 +26,12 @@
 ;;      along with this program; if not, write to the Free Software
 ;;      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  
USA
 ;;
-;;     $Id: menus.ccl,v 1.88 2003/07/11 18:27:04 grumbel Exp $
+;;     $Id: menus.ccl,v 1.89 2003/08/02 13:37:06 grumbel Exp $
 
 ;;
 ;; load the keystroke helps
 ;;
-(load "ccl/keystrokes.ccl" #f #t)
+(ccl:load "ccl/keystrokes.ccl")
 
 ;;
 ;; define the menu graphics
Index: stratagus/data/ccl/sound.ccl
diff -u stratagus/data/ccl/sound.ccl:1.33 stratagus/data/ccl/sound.ccl:1.34
--- stratagus/data/ccl/sound.ccl:1.33   Fri Jul 11 14:27:04 2003
+++ stratagus/data/ccl/sound.ccl        Sat Aug  2 09:37:06 2003
@@ -26,9 +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: sound.ccl,v 1.33 2003/07/11 18:27:04 grumbel Exp $
-
-(if (with-sound) (begin
+;;     $Id: sound.ccl,v 1.34 2003/08/02 13:37:06 grumbel Exp $
 
 ;;     Uncomment this to enable threaded sound
 ;(sound-thread)
@@ -858,4 +856,4 @@
   'rescue (list 'orc (make-sound "orc rescue" "orc/rescue.wav")) )
 
 (define sound-click (make-sound "highclick" "ui/highclick.wav"))
-(define sound-click (make-sound "statsthump" "ui/statsthump.wav")) ))
+(define sound-click (make-sound "statsthump" "ui/statsthump.wav"))
Index: stratagus/data/ccl/stratagus.ccl
diff -u stratagus/data/ccl/stratagus.ccl:1.4 
stratagus/data/ccl/stratagus.ccl:1.5
--- stratagus/data/ccl/stratagus.ccl:1.4        Fri Jul 11 14:27:04 2003
+++ stratagus/data/ccl/stratagus.ccl    Sat Aug  2 09:37:06 2003
@@ -26,7 +26,12 @@
 ;;      along with this program; if not, write to the Free Software
 ;;      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  
USA
 ;;
-;;     $Id: stratagus.ccl,v 1.4 2003/07/11 18:27:04 grumbel Exp $
+;;     $Id: stratagus.ccl,v 1.5 2003/08/02 13:37:06 grumbel Exp $
+
+(cond ((equal? *scheme* 'guile)
+       (load "guile.ccl"))
+      ((equal? *scheme* 'siod)
+       (load "ccl/siod.ccl" #f #t)))
 
 (writes nil "Stratagus default config file loading ...\n")
 
@@ -75,13 +80,21 @@
 ;
 ;;     Create a list from the directory content
 ;
+
 (define (dir->list s . prepend)
   (define (aux d rl p)
     (let ((q (readdir d)))
-      (if (equal? q ()) (begin (closedir d) rl)
-          (if (or (equal? q ".") (equal? q "..")) (aux d rl p)
-              (aux d (cons (string-append p q) rl) p)))))
-  (aux (opendir s) () (if (string? (car prepend)) (car prepend) "")))
+      (cond ((eof-object? q)
+             (closedir d)
+             rl)
+            (else
+             (if (or (equal? q ".") (equal? q ".."))
+                 (aux d rl p)
+                 (aux d (cons (string-append p q) rl) p))))))
+
+  (aux (opendir s) '() (if (string? (car prepend))
+                           (car prepend) 
+                           "")))
 
 ;; Uncomment to play automatic all music
 ;; FIXME: Comments are wrong, system dependend stuff didn't belong into the
@@ -432,33 +445,34 @@
 
 (define (single-player-triggers)
   (add-trigger '((if-unit 'this '== 0 'all))
-    '((action-defeat)))
+               '((action-defeat)))
   (add-trigger '((if-opponents 'this '== 0))
-    '((action-victory))) )
+               '((action-victory))))
 
 ;;-----------------------------------------------------------------------------
 ;;     Tables-Part
 ;;-----------------------------------------------------------------------------
 
 ;;; Uses Stratagus Library path!
-(load "ccl/wc2.ccl" #f #t)
+(ccl:load "ccl/wc2.ccl")
 
-(load "ccl/tilesets.ccl" #f #t)
-(load "ccl/icons.ccl" #f #t)
-(load "ccl/sound.ccl" #f #t)
-(load "ccl/missiles.ccl" #f #t)
-(load "ccl/constructions.ccl" #f #t)
-(load "ccl/units.ccl" #f #t)
-(load "ccl/upgrade.ccl" #f #t)
-(load "ccl/fonts.ccl" #f #t)
-(load "ccl/buttons.ccl" #f #t)
-(load "ccl/ui.ccl" #f #t)
-(load "ccl/ai.ccl" #f #t)
-(load "ccl/campaigns.ccl" #f #t)
-(load "ccl/credits.ccl" #f #t)
-(load "ccl/tips.ccl" #f #t)
-(load "ccl/ranks.ccl" #f #t)
-(load "ccl/menus.ccl" #f #t)
+(ccl:load "ccl/tilesets.ccl")
+(ccl:load "ccl/icons.ccl")
+(if (with-sound)
+    (ccl:load "ccl/sound.ccl"))
+(ccl:load "ccl/missiles.ccl")
+(ccl:load "ccl/constructions.ccl")
+(ccl:load "ccl/units.ccl")
+(ccl:load "ccl/upgrade.ccl")
+(ccl:load "ccl/fonts.ccl")
+(ccl:load "ccl/buttons.ccl")
+(ccl:load "ccl/ui.ccl")
+(ccl:load "ccl/ai.ccl")
+(ccl:load "ccl/campaigns.ccl")
+(ccl:load "ccl/credits.ccl")
+(ccl:load "ccl/tips.ccl")
+(ccl:load "ccl/ranks.ccl")
+(ccl:load "ccl/menus.ccl")
 
 ;;-----------------------------------------------------------------------------
 
@@ -491,3 +505,4 @@
 ;;-----------------------------------------------------------------------------
 
 (writes nil "... ready!\n")
+(display (unit-type-array))
\ No newline at end of file
Index: stratagus/data/ccl/ui.ccl
diff -u stratagus/data/ccl/ui.ccl:1.17 stratagus/data/ccl/ui.ccl:1.18
--- stratagus/data/ccl/ui.ccl:1.17      Fri Jul 11 14:27:04 2003
+++ stratagus/data/ccl/ui.ccl   Sat Aug  2 09:37:06 2003
@@ -26,12 +26,12 @@
 ;;      along with this program; if not, write to the Free Software
 ;;      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  
USA
 ;;
-;;     $Id: ui.ccl,v 1.17 2003/07/11 18:27:04 grumbel Exp $
+;;     $Id: ui.ccl,v 1.18 2003/08/02 13:37:06 grumbel Exp $
 
 (define color-dark-green       149)    ; FIXME: move to central position
 
-(load "ccl/human/ui.ccl" #f #t)
-(load "ccl/orc/ui.ccl" #f #t)
+(ccl:load "ccl/human/ui.ccl")
+(ccl:load "ccl/orc/ui.ccl")
 
 ;;=============================================================================
 ;;     Define a cursor.
Index: stratagus/data/ccl/units.ccl
diff -u stratagus/data/ccl/units.ccl:1.38 stratagus/data/ccl/units.ccl:1.39
--- stratagus/data/ccl/units.ccl:1.38   Thu Jul 24 15:27:32 2003
+++ stratagus/data/ccl/units.ccl        Sat Aug  2 09:37:06 2003
@@ -26,10 +26,10 @@
 ;;      along with this program; if not, write to the Free Software
 ;;      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  
USA
 ;;
-;;     $Id: units.ccl,v 1.38 2003/07/24 19:27:32 n0body Exp $
+;;     $Id: units.ccl,v 1.39 2003/08/02 13:37:06 grumbel Exp $
 
 ;; Load the animations for the units.
-(load "ccl/anim.ccl" #f #t)
+(ccl:load "ccl/anim.ccl")
 
 ;;=============================================================================
 ;;     Define unit-types.
@@ -432,6 +432,6 @@
   'sounds '())
 
 ;; Load the different races
-(load "ccl/human/units.ccl" #f #t)
-(load "ccl/orc/units.ccl" #f #t)
+(ccl:load "ccl/human/units.ccl")
+(ccl:load "ccl/orc/units.ccl")
 
Index: stratagus/data/ccl/upgrade.ccl
diff -u stratagus/data/ccl/upgrade.ccl:1.14 stratagus/data/ccl/upgrade.ccl:1.15
--- stratagus/data/ccl/upgrade.ccl:1.14 Thu Jul  3 13:30:01 2003
+++ stratagus/data/ccl/upgrade.ccl      Sat Aug  2 09:37:06 2003
@@ -26,11 +26,11 @@
 ;;      along with this program; if not, write to the Free Software
 ;;      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  
USA
 ;;
-;;     $Id: upgrade.ccl,v 1.14 2003/07/03 17:30:01 ingo Exp $
+;;     $Id: upgrade.ccl,v 1.15 2003/08/02 13:37:06 grumbel Exp $
 
 ;; Load the different races
-(load "ccl/human/upgrade.ccl" #f #t)
-(load "ccl/orc/upgrade.ccl" #f #t)
+(ccl:load "ccl/human/upgrade.ccl")
+(ccl:load "ccl/orc/upgrade.ccl")
 
 ;;=============================================================================
 ;;
Index: stratagus/data/ccl/wc2.ccl
diff -u stratagus/data/ccl/wc2.ccl:1.31 stratagus/data/ccl/wc2.ccl:1.32
--- stratagus/data/ccl/wc2.ccl:1.31     Thu Jul  3 13:33:45 2003
+++ stratagus/data/ccl/wc2.ccl  Sat Aug  2 09:37:06 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: wc2.ccl,v 1.31 2003/07/03 17:33:45 ingo Exp $
+;;     $Id: wc2.ccl,v 1.32 2003/08/02 13:37:06 grumbel Exp $
 
 ;;=============================================================================
 ;;     Define race names
@@ -257,4 +257,4 @@
 (set-color-building-cycle-start! 205)
 (set-color-building-cycle-end! 207)
 
-(load "ccl/wc2-config.ccl" #f #t)
+(ccl:load "ccl/wc2-config.ccl")