Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-17 21:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r20866) -Codechange: CheckTile() always returns the same (ignored) value.

Browse Source
This commit is contained in:
alberth 2010-10-02 09:55:58 +00:00
parent 3208b8f655
commit f509a0a922
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pathfinder/npf/aystar.cpp
View File

@ -84,28 +84,26 @@ static void AyStarMain_OpenList_Add(AyStar *aystar, PathNode *parent, const AySt
/* /*
* Checks one tile and calculate his f-value * Checks one tile and calculate his f-value
* return values:
* AYSTAR_DONE : indicates we are done
*/ */
int AyStar::CheckTile(AyStarNode *current, OpenListNode *parent) void AyStar::CheckTile(AyStarNode *current, OpenListNode *parent)
{ {
int new_f, new_g, new_h; int new_f, new_g, new_h;
PathNode *closedlist_parent; PathNode *closedlist_parent;
OpenListNode *check; OpenListNode *check;
/* Check the new node against the ClosedList */ /* Check the new node against the ClosedList */
if (AyStarMain_ClosedList_IsInList(this, current) != NULL) return AYSTAR_DONE; if (AyStarMain_ClosedList_IsInList(this, current) != NULL) return;
/* Calculate the G-value for this node */ /* Calculate the G-value for this node */
new_g = this->CalculateG(this, current, parent); new_g = this->CalculateG(this, current, parent);
/* If the value was INVALID_NODE, we don't do anything with this node */ /* If the value was INVALID_NODE, we don't do anything with this node */
if (new_g == AYSTAR_INVALID_NODE) return AYSTAR_DONE; if (new_g == AYSTAR_INVALID_NODE) return;
/* There should not be given any other error-code.. */ /* There should not be given any other error-code.. */
assert(new_g >= 0); assert(new_g >= 0);
/* Add the parent g-value to the new g-value */ /* Add the parent g-value to the new g-value */
new_g += parent->g; new_g += parent->g;
if (this->max_path_cost != 0 && (uint)new_g > this->max_path_cost) return AYSTAR_DONE; if (this->max_path_cost != 0 && (uint)new_g > this->max_path_cost) return;
/* Calculate the h-value */ /* Calculate the h-value */
new_h = this->CalculateH(this, current, parent); new_h = this->CalculateH(this, current, parent);
@ -123,7 +121,7 @@ int AyStar::CheckTile(AyStarNode *current, OpenListNode *parent)
if (check != NULL) { if (check != NULL) {
uint i; uint i;
/* Yes, check if this g value is lower.. */ /* Yes, check if this g value is lower.. */
if (new_g > check->g) return AYSTAR_DONE; if (new_g > check->g) return;
this->OpenListQueue.Delete(check, 0); this->OpenListQueue.Delete(check, 0);
/* It is lower, so change it to this item */ /* It is lower, so change it to this item */
check->g = new_g; check->g = new_g;
@ -138,8 +136,6 @@ int AyStar::CheckTile(AyStarNode *current, OpenListNode *parent)
/* A new node, add him to the OpenList */ /* A new node, add him to the OpenList */
AyStarMain_OpenList_Add(this, closedlist_parent, current, new_f, new_g); AyStarMain_OpenList_Add(this, closedlist_parent, current, new_f, new_g);
} }
return AYSTAR_DONE;
} }
/* /*

2
src/pathfinder/npf/aystar.h
View File

@ -150,7 +150,7 @@ struct AyStar {
int Loop(); int Loop();
void Free(); void Free();
void Clear(); void Clear();
int CheckTile(AyStarNode *current, OpenListNode *parent); void CheckTile(AyStarNode *current, OpenListNode *parent);
/* These will contain the open and closed lists */ /* These will contain the open and closed lists */