[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus doc/ChangeLog.html src/pathfinder/ast...
|
From: |
Russell Smith |
|
Subject: |
[Stratagus-CVS] stratagus doc/ChangeLog.html src/pathfinder/ast... |
|
Date: |
Sun, 31 Aug 2003 04:01:21 -0400 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: Russell Smith <address@hidden> 03/08/31 04:01:21
Modified files:
doc : ChangeLog.html
src/pathfinder : astar.c ccl_pathfinder.c
data/ccl : stratagus.ccl
Log message:
Fixed pathfinder bugs that stopped units. MovingUnitCrossing Cost was
not set high enough. Minimums increased to solve
the problem.
Patches:
Index: stratagus/data/ccl/stratagus.ccl
diff -u stratagus/data/ccl/stratagus.ccl:1.8
stratagus/data/ccl/stratagus.ccl:1.9
--- stratagus/data/ccl/stratagus.ccl:1.8 Mon Aug 25 07:21:13 2003
+++ stratagus/data/ccl/stratagus.ccl Sun Aug 31 04:01:21 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: stratagus.ccl,v 1.8 2003/08/25 11:21:13 mr-russ Exp $
+;; $Id: stratagus.ccl,v 1.9 2003/08/31 08:01:21 mr-russ Exp $
(cond ((equal? *scheme* 'guile)
(load "guile.ccl"))
@@ -437,7 +437,7 @@
;;-----------------------------------------------------------------------------
-(a-star 'on 'fixed-unit-cost 1000 'moving-unit-cost 2
'dont-know-unseen-terrain 'unseen-terrain-cost 2)
+(a-star 'on 'fixed-unit-cost 1000 'moving-unit-cost 20
'dont-know-unseen-terrain 'unseen-terrain-cost 2)
;;-----------------------------------------------------------------------------
Index: stratagus/doc/ChangeLog.html
diff -u stratagus/doc/ChangeLog.html:1.516 stratagus/doc/ChangeLog.html:1.517
--- stratagus/doc/ChangeLog.html:1.516 Thu Aug 28 08:20:03 2003
+++ stratagus/doc/ChangeLog.html Sun Aug 31 04:01:20 2003
@@ -2,7 +2,7 @@
<html>
<head>
<!--
----- $Id: ChangeLog.html,v 1.516 2003/08/28 12:20:03 mr-russ Exp $
+---- $Id: ChangeLog.html,v 1.517 2003/08/31 08:01:20 mr-russ Exp $
---- (c) Copyright 1998-2003 by Lutz Sammer
@@ -36,6 +36,7 @@
<li>Future 1.19 Release<p>
<ul>
<li>++
+ <li>Fixed Pathfinder cost bug, which stopped units from moving (from
Russell Smith).
<li>Fixed Pathfinder bug and cleaned up vision table management (from
Russell Smith).
<li>Added Circular Goal support, Major vision and pathfinding changes
(from Russell Smith).
<li>Added flags for different building methods (from Crestez Leonard).
Index: stratagus/src/pathfinder/astar.c
diff -u stratagus/src/pathfinder/astar.c:1.48
stratagus/src/pathfinder/astar.c:1.49
--- stratagus/src/pathfinder/astar.c:1.48 Thu Aug 28 18:51:42 2003
+++ stratagus/src/pathfinder/astar.c Sun Aug 31 04:01:20 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: astar.c,v 1.48 2003/08/28 22:51:42 n0body Exp $
+// $Id: astar.c,v 1.49 2003/08/31 08:01:20 mr-russ Exp $
//@{
@@ -88,10 +88,10 @@
/// see pathfinder.h
global int AStarFixedUnitCrossingCost=MaxMapWidth*MaxMapHeight;
-global int AStarMovingUnitCrossingCost=2;
-global int AStarOn=0;
+global int AStarMovingUnitCrossingCost=5;
+global int AStarOn=1;
global int AStarKnowUnknown=0;
-global int AStarUnknownTerrainCost=100;
+global int AStarUnknownTerrainCost=2;
/**
** The Open set is handled by a Heap stored in a table
Index: stratagus/src/pathfinder/ccl_pathfinder.c
diff -u stratagus/src/pathfinder/ccl_pathfinder.c:1.20
stratagus/src/pathfinder/ccl_pathfinder.c:1.21
--- stratagus/src/pathfinder/ccl_pathfinder.c:1.20 Sat Aug 2 09:34:25 2003
+++ stratagus/src/pathfinder/ccl_pathfinder.c Sun Aug 31 04:01:21 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ccl_pathfinder.c,v 1.20 2003/08/02 13:34:25 grumbel Exp $
+// $Id: ccl_pathfinder.c,v 1.21 2003/08/31 08:01:21 mr-russ Exp $
//@{
@@ -82,18 +82,18 @@
} else if( gh_eq_p(value,gh_symbol2scm("fixed-unit-cost")) ) {
i=gh_scm2int(gh_car(list));
list=gh_cdr(list);
- if( i <=0 ) {
+ if( i <=3 ) {
PrintFunction();
- fprintf(stdout,"Fixed unit crossing cost must be strictly
positive\n");
+ fprintf(stdout,"Fixed unit crossing cost must be strictly >
3\n");
} else {
AStarFixedUnitCrossingCost=i;
}
} else if( gh_eq_p(value,gh_symbol2scm("moving-unit-cost")) ) {
i=gh_scm2int(gh_car(list));
list=gh_cdr(list);
- if( i<=0) {
+ if( i<=3) {
PrintFunction();
- fprintf(stdout,"Moving unit crossing cost must be strictly
positive\n");
+ fprintf(stdout,"Moving unit crossing cost must be strictly >
3\n");
} else {
AStarMovingUnitCrossingCost=i;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] stratagus doc/ChangeLog.html src/pathfinder/ast...,
Russell Smith <=