[Stratagus-CVS] demogame/ccl ai.ccl buttons.ccl constructions.c...

[Martin Renold]

CVSROOT:        /cvsroot/stratagus
Module name:    demogame
Branch:         
Changes by:     Martin Renold <address@hidden>  03/10/12 16:06:09

Modified files:
        ccl            : ai.ccl buttons.ccl constructions.ccl menus.ccl 
                         spells.ccl stratagus.ccl units.ccl upgrade.ccl 
Added files:
        ccl            : guile.ccl siod.ccl 

Log message:
        using siod.ccl and guile.ccl now

Patches:
Index: demogame/ccl/ai.ccl
diff -u demogame/ccl/ai.ccl:1.6 demogame/ccl/ai.ccl:1.7
--- demogame/ccl/ai.ccl:1.6     Wed Oct  8 05:14:00 2003
+++ demogame/ccl/ai.ccl Sun Oct 12 16:06:08 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: ai.ccl,v 1.6 2003/10/08 09:14:00 martinxyz Exp $
+;;     $Id: ai.ccl,v 1.7 2003/10/12 20:06:08 martinxyz Exp $
 
 ;; AI fallback script
 (define-ai "idle-o-matic" "*" "passive"
@@ -36,8 +36,8 @@
     ))
 
 ;; Load the race specific ai
-(load "ccl/alliance/ai.ccl" #f #t)
-(load "ccl/mythical/ai.ccl" #f #t)
+(ccl:load "ccl/alliance/ai.ccl")
+(ccl:load "ccl/mythical/ai.ccl")
 
 ; The rest of this file contains only docu comments, which should be removed
 ; from here and added to stratagus/doc/ccl/ai.html if necessary.
Index: demogame/ccl/buttons.ccl
diff -u demogame/ccl/buttons.ccl:1.4 demogame/ccl/buttons.ccl:1.5
--- demogame/ccl/buttons.ccl:1.4        Tue Oct  7 09:28:00 2003
+++ demogame/ccl/buttons.ccl    Sun Oct 12 16:06:09 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: buttons.ccl,v 1.4 2003/10/07 13:28:00 martinxyz Exp $
+;;     $Id: buttons.ccl,v 1.5 2003/10/12 20:06:09 martinxyz Exp $
 
 ;; Load the buttons of all races
-(load "ccl/alliance/buttons.ccl" #f #t)
-(load "ccl/mythical/buttons.ccl" #f #t)
+(ccl:load "ccl/alliance/buttons.ccl")
+(ccl:load "ccl/mythical/buttons.ccl")
 
 ;;----------------------------------------------------------------------------
 ;;     Define unit-button.
Index: demogame/ccl/constructions.ccl
diff -u demogame/ccl/constructions.ccl:1.1 demogame/ccl/constructions.ccl:1.2
--- demogame/ccl/constructions.ccl:1.1  Sat Jul 26 09:39:14 2003
+++ demogame/ccl/constructions.ccl      Sun Oct 12 16:06:09 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.1 2003/07/26 13:39:14 martinxyz Exp $
+;;     $Id: constructions.ccl,v 1.2 2003/10/12 20:06:09 martinxyz Exp $
 
-(load "ccl/alliance/constructions.ccl" #f #t)
-(load "ccl/mythical/constructions.ccl" #f #t)
+(ccl:load "ccl/alliance/constructions.ccl")
+(ccl:load "ccl/mythical/constructions.ccl")
 
 ;;=============================================================================
 ;;     Define a construction.
Index: demogame/ccl/menus.ccl
diff -u demogame/ccl/menus.ccl:1.4 demogame/ccl/menus.ccl:1.5
--- demogame/ccl/menus.ccl:1.4  Sun Oct 12 01:52:22 2003
+++ demogame/ccl/menus.ccl      Sun Oct 12 16:06:09 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.4 2003/10/12 05:52:22 martinxyz Exp $
+;;     $Id: menus.ccl,v 1.5 2003/10/12 20:06:09 martinxyz Exp $
 
 ;;
 ;; load the keystroke helps
 ;;
-(load "ccl/keystrokes.ccl" #f #t)
+(ccl:load "ccl/keystrokes.ccl")
 
 ; FIXME: get them from tileset definition
 (define race-names '("Alliance" "Mythical"))
Index: demogame/ccl/spells.ccl
diff -u demogame/ccl/spells.ccl:1.4 demogame/ccl/spells.ccl:1.5
--- demogame/ccl/spells.ccl:1.4 Thu Oct  9 12:10:35 2003
+++ demogame/ccl/spells.ccl     Sun Oct 12 16:06:09 2003
@@ -26,8 +26,8 @@
 ;;      along with this program; if not, write to the Free Software

 ;;      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  
USA

 ;;

-;;     $Id: spells.ccl,v 1.4 2003/10/09 16:10:35 martinxyz Exp $

+;;     $Id: spells.ccl,v 1.5 2003/10/12 20:06:09 martinxyz Exp $

 

 ;; Load the different races

-(load "ccl/alliance/spells.ccl" #f #t)

-(load "ccl/mythical/spells.ccl" #f #t)

+(ccl:load "ccl/alliance/spells.ccl")

+(ccl:load "ccl/mythical/spells.ccl")

Index: demogame/ccl/stratagus.ccl
diff -u demogame/ccl/stratagus.ccl:1.10 demogame/ccl/stratagus.ccl:1.11
--- demogame/ccl/stratagus.ccl:1.10     Thu Oct  9 15:32:40 2003
+++ demogame/ccl/stratagus.ccl  Sun Oct 12 16:06:09 2003
@@ -26,12 +26,17 @@
 ;;      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.10 2003/10/09 19:32:40 martinxyz Exp $
+;;     $Id: stratagus.ccl,v 1.11 2003/10/12 20:06:09 martinxyz Exp $
 
 ;; For documentation see stratagus/doc/ccl/ccl.html
 
 (verbose 4)
 
+(cond ((equal? *scheme* 'guile)
+       (load "guile.ccl"))
+      ((equal? *scheme* 'siod)
+       (load "ccl/siod.ccl" #f #t)))
+
 (writes nil "Stratagus default config file loading ...\n")
 
 ; Config file version
@@ -417,25 +422,25 @@
 ;;-----------------------------------------------------------------------------
 
 ;;; Uses Stratagus Library path!
-(load "ccl/wc2.ccl" #f #t) ; <-- FIXME: get rid of this
-(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/spells.ccl" #f #t)
-(load "ccl/units.ccl" #f #t)
-(load "ccl/upgrade.ccl" #f #t)
-(load "ccl/buttons.ccl" #f #t)
-(load "ccl/fonts.ccl" #f #t)
-(load "ccl/ui.ccl" #f #t)
-(load "ccl/ai.ccl" #f #t)
+(ccl:load "ccl/wc2.ccl") ; <-- FIXME: get rid of this
+(ccl:load "ccl/tilesets.ccl")
+(ccl:load "ccl/icons.ccl")
+(ccl:load "ccl/sound.ccl")
+(ccl:load "ccl/missiles.ccl")
+(ccl:load "ccl/constructions.ccl")
+(ccl:load "ccl/spells.ccl")
+(ccl:load "ccl/units.ccl")
+(ccl:load "ccl/upgrade.ccl")
+(ccl:load "ccl/buttons.ccl")
+(ccl:load "ccl/fonts.ccl")
+(ccl:load "ccl/ui.ccl")
+(ccl:load "ccl/ai.ccl")
 ; not used:
-;(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/campaigns.ccl")
+(ccl:load "ccl/credits.ccl")
+(ccl:load "ccl/tips.ccl")
+(ccl:load "ccl/ranks.ccl")
+(ccl:load "ccl/menus.ccl")
 
 ;;-----------------------------------------------------------------------------
 
Index: demogame/ccl/units.ccl
diff -u demogame/ccl/units.ccl:1.10 demogame/ccl/units.ccl:1.11
--- demogame/ccl/units.ccl:1.10 Sat Oct 11 05:00:15 2003
+++ demogame/ccl/units.ccl      Sun Oct 12 16:06:09 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.10 2003/10/11 09:00:15 martinxyz Exp $
+;;     $Id: units.ccl,v 1.11 2003/10/12 20:06:09 martinxyz Exp $
 
 ;; Load the animations for the units.
-(load "ccl/anim.ccl" #f #t)
+(ccl:load "ccl/anim.ccl")
 
 ;;=============================================================================
 ;;     Define unit-types.
@@ -356,6 +356,6 @@
   'sounds '())
 
 ;; Load the different races
-(load "ccl/alliance/units.ccl" #f #t)
-(load "ccl/mythical/units.ccl" #f #t)
+(ccl:load "ccl/alliance/units.ccl")
+(ccl:load "ccl/mythical/units.ccl")
 
Index: demogame/ccl/upgrade.ccl
diff -u demogame/ccl/upgrade.ccl:1.3 demogame/ccl/upgrade.ccl:1.4
--- demogame/ccl/upgrade.ccl:1.3        Sat Oct 11 05:00:15 2003
+++ demogame/ccl/upgrade.ccl    Sun Oct 12 16:06:09 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.3 2003/10/11 09:00:15 martinxyz Exp $
+;;     $Id: upgrade.ccl,v 1.4 2003/10/12 20:06:09 martinxyz Exp $
 
 ;; Load the different races
-(load "ccl/alliance/upgrade.ccl" #f #t)
-(load "ccl/mythical/upgrade.ccl" #f #t)
+(ccl:load "ccl/alliance/upgrade.ccl")
+(ccl:load "ccl/mythical/upgrade.ccl")
 
 ;;=============================================================================
 ;;