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 r20863) -Codechange: Make AyStarMain_Loop a method.

Browse Source
This commit is contained in:
alberth 2010-10-02 09:48:01 +00:00
parent a6efd14f9f
commit d02baa4a11
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,40 +153,40 @@ static int AyStarMain_CheckTile(AyStar *aystar, AyStarNode *current, OpenListNod
* AYSTAR_FOUND_END_NODE : indicates we found the end. Path_found now is true, and in path is the path found. * AYSTAR_FOUND_END_NODE : indicates we found the end. Path_found now is true, and in path is the path found.
* AYSTAR_STILL_BUSY : indicates we have done this tile, did not found the path yet, and have items left to try. * AYSTAR_STILL_BUSY : indicates we have done this tile, did not found the path yet, and have items left to try.
*/ */
static int AyStarMain_Loop(AyStar *aystar) int AyStar::Loop()
{ {
int i; int i;
/* Get the best node from OpenList */ /* Get the best node from OpenList */
OpenListNode *current = AyStarMain_OpenList_Pop(aystar); OpenListNode *current = AyStarMain_OpenList_Pop(this);
/* If empty, drop an error */ /* If empty, drop an error */
if (current == NULL) return AYSTAR_EMPTY_OPENLIST; if (current == NULL) return AYSTAR_EMPTY_OPENLIST;
/* Check for end node and if found, return that code */ /* Check for end node and if found, return that code */
if (aystar->EndNodeCheck(aystar, current) == AYSTAR_FOUND_END_NODE) { if (this->EndNodeCheck(this, current) == AYSTAR_FOUND_END_NODE) {
if (aystar->FoundEndNode != NULL) { if (this->FoundEndNode != NULL) {
aystar->FoundEndNode(aystar, current); this->FoundEndNode(this, current);
} }
free(current); free(current);
return AYSTAR_FOUND_END_NODE; return AYSTAR_FOUND_END_NODE;
} }
/* Add the node to the ClosedList */ /* Add the node to the ClosedList */
AyStarMain_ClosedList_Add(aystar, &current->path); AyStarMain_ClosedList_Add(this, &current->path);
/* Load the neighbours */ /* Load the neighbours */
aystar->GetNeighbours(aystar, current); this->GetNeighbours(this, current);
/* Go through all neighbours */ /* Go through all neighbours */
for (i = 0; i < aystar->num_neighbours; i++) { for (i = 0; i < this->num_neighbours; i++) {
/* Check and add them to the OpenList if needed */ /* Check and add them to the OpenList if needed */
aystar->checktile(aystar, &aystar->neighbours[i], current); this->checktile(this, &this->neighbours[i], current);
} }
/* Free the node */ /* Free the node */
free(current); free(current);
if (aystar->max_search_nodes != 0 && Hash_Size(&aystar->ClosedListHash) >= aystar->max_search_nodes) { if (this->max_search_nodes != 0 && Hash_Size(&this->ClosedListHash) >= this->max_search_nodes) {
/* We've expanded enough nodes */ /* We've expanded enough nodes */
return AYSTAR_LIMIT_REACHED; return AYSTAR_LIMIT_REACHED;
} else { } else {
@ -243,7 +243,7 @@ int AyStarMain_Main(AyStar *aystar)
int r, i = 0; int r, i = 0;
/* Loop through the OpenList /* Loop through the OpenList
* Quit if result is no AYSTAR_STILL_BUSY or is more than loops_per_tick */ * Quit if result is no AYSTAR_STILL_BUSY or is more than loops_per_tick */
while ((r = aystar->loop(aystar)) == AYSTAR_STILL_BUSY && (aystar->loops_per_tick == 0 || ++i < aystar->loops_per_tick)) { } while ((r = aystar->Loop()) == AYSTAR_STILL_BUSY && (aystar->loops_per_tick == 0 || ++i < aystar->loops_per_tick)) { }
#ifdef AYSTAR_DEBUG #ifdef AYSTAR_DEBUG
switch (r) { switch (r) {
case AYSTAR_FOUND_END_NODE: printf("[AyStar] Found path!\n"); break; case AYSTAR_FOUND_END_NODE: printf("[AyStar] Found path!\n"); break;
@ -295,7 +295,6 @@ void init_AyStar(AyStar *aystar, Hash_HashProc hash, uint num_buckets)
aystar->addstart = AyStarMain_AddStartNode; aystar->addstart = AyStarMain_AddStartNode;
aystar->main = AyStarMain_Main; aystar->main = AyStarMain_Main;
aystar->loop = AyStarMain_Loop;
aystar->clear = AyStarMain_Clear; aystar->clear = AyStarMain_Clear;
aystar->checktile = AyStarMain_CheckTile; aystar->checktile = AyStarMain_CheckTile;
} }

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

@ -106,7 +106,6 @@ typedef void AyStar_FoundEndNode(AyStar *aystar, OpenListNode *current);
/* For internal use, see aystar.cpp */ /* For internal use, see aystar.cpp */
typedef void AyStar_AddStartNode(AyStar *aystar, AyStarNode *start_node, uint g); typedef void AyStar_AddStartNode(AyStar *aystar, AyStarNode *start_node, uint g);
typedef int AyStar_Main(AyStar *aystar); typedef int AyStar_Main(AyStar *aystar);
typedef int AyStar_Loop(AyStar *aystar);
typedef int AyStar_CheckTile(AyStar *aystar, AyStarNode *current, OpenListNode *parent); typedef int AyStar_CheckTile(AyStar *aystar, AyStarNode *current, OpenListNode *parent);
typedef void AyStar_Clear(AyStar *aystar); typedef void AyStar_Clear(AyStar *aystar);
@ -150,7 +149,7 @@ struct AyStar {
* main() should be called externally */ * main() should be called externally */
AyStar_AddStartNode *addstart; AyStar_AddStartNode *addstart;
AyStar_Main *main; AyStar_Main *main;
AyStar_Loop *loop; int Loop();
void Free(); void Free();
AyStar_Clear *clear; AyStar_Clear *clear;
AyStar_CheckTile *checktile; AyStar_CheckTile *checktile;