[Stratagus-CVS] stratagus/data/ccl ai.ccl guile.ccl siod.ccl

[ludovic p]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     ludovic p <address@hidden>      03/10/27 05:33:45

Modified files:
        data/ccl       : ai.ccl guile.ccl siod.ccl 

Log message:
        Fixed AI for guile

Patches:
Index: stratagus/data/ccl/ai.ccl
diff -u stratagus/data/ccl/ai.ccl:1.56 stratagus/data/ccl/ai.ccl:1.57
--- stratagus/data/ccl/ai.ccl:1.56      Thu Oct 23 14:38:32 2003
+++ stratagus/data/ccl/ai.ccl   Mon Oct 27 05:33:45 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.56 2003/10/23 18:38:32 n0body Exp $
+;;     $Id: ai.ccl,v 1.57 2003/10/27 10:33:45 pludov Exp $
 
 ;(define (ai:sleep) () #t)
 
@@ -559,7 +559,7 @@
        (cond
            ((null? pcts)       '())
            (#t 
-               (let* ( (unittype (eval (caar pcts) ))
+               (let* ( (unittype (ccl:eval (caar pcts) ))
                        (gauges_pcts (cdar pcts))
                        (want_pct (ai:sum-gauges-pcts gauges_pcts))
                        (unit_force (ai:get-unittype-force unittype))
@@ -594,7 +594,7 @@
                
            ;; Build at least one of the first type.
            (if (null? units)
-               (set! units (list (eval (caar units_pct) ) 1)))
+               (set! units (list (ccl:eval (caar units_pct) ) 1)))
            
            ;; Complete if necessary to achieve minimum force ...
            (set! units (complete-force-to units force-mini))
Index: stratagus/data/ccl/guile.ccl
diff -u stratagus/data/ccl/guile.ccl:1.1 stratagus/data/ccl/guile.ccl:1.2
--- stratagus/data/ccl/guile.ccl:1.1    Sat Aug  2 09:37:06 2003
+++ stratagus/data/ccl/guile.ccl        Mon Oct 27 05:33:45 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: guile.ccl,v 1.1 2003/08/02 13:37:06 grumbel Exp $
+;;     $Id: guile.ccl,v 1.2 2003/10/27 10:33:45 pludov Exp $
 
 (define *scheme* 'guile)
 
@@ -56,6 +56,9 @@
 
 (define (ccl:load filename)
   (load (substring filename 4)))
+
+(define (ccl:eval str)
+  (eval str (current-module)))
 
 (display "Using Scheme: Guile\n")
 
Index: stratagus/data/ccl/siod.ccl
diff -u stratagus/data/ccl/siod.ccl:1.1 stratagus/data/ccl/siod.ccl:1.2
--- stratagus/data/ccl/siod.ccl:1.1     Sat Aug  2 09:37:06 2003
+++ stratagus/data/ccl/siod.ccl Mon Oct 27 05:33:45 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: siod.ccl,v 1.1 2003/08/02 13:37:06 grumbel Exp $
+;;     $Id: siod.ccl,v 1.2 2003/10/27 10:33:45 pludov Exp $
 
 ;; Helper functions and other stuff to get SIOD a bit more R5RS
 ;; compatible
@@ -36,6 +36,9 @@
 
 (define (ccl:load filename)
   (load filename #f #t))
+
+(define (ccl:eval code)
+  (eval code))
 
 (define else #t)