mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r20862) -Codechange: Make AyStar_Free() a method.

release/1.1
alberth 2010-10-02 09:46:40 +00:00
parent 78fe0457b4
commit 581d1070b4
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,13 +198,13 @@ static int AyStarMain_Loop(AyStar *aystar)
/* /*
* This function frees the memory it allocated * This function frees the memory it allocated
*/ */
static void AyStarMain_Free(AyStar *aystar) void AyStar::Free()
{ {
aystar->OpenListQueue.Free(false); this->OpenListQueue.Free(false);
/* 2nd argument above is false, below is true, to free the values only /* 2nd argument above is false, below is true, to free the values only
* once */ * once */
delete_Hash(&aystar->OpenListHash, true); delete_Hash(&this->OpenListHash, true);
delete_Hash(&aystar->ClosedListHash, true); delete_Hash(&this->ClosedListHash, true);
#ifdef AYSTAR_DEBUG #ifdef AYSTAR_DEBUG
printf("[AyStar] Memory free'd\n"); printf("[AyStar] Memory free'd\n");
#endif #endif
@ -296,7 +296,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->loop = AyStarMain_Loop;
aystar->free = AyStarMain_Free;
aystar->clear = AyStarMain_Clear; aystar->clear = AyStarMain_Clear;
aystar->checktile = AyStarMain_CheckTile; aystar->checktile = AyStarMain_CheckTile;
} }

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

@ -108,7 +108,6 @@ 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_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_Free(AyStar *aystar);
typedef void AyStar_Clear(AyStar *aystar); typedef void AyStar_Clear(AyStar *aystar);
struct AyStar { struct AyStar {
@ -152,7 +151,7 @@ struct AyStar {
AyStar_AddStartNode *addstart; AyStar_AddStartNode *addstart;
AyStar_Main *main; AyStar_Main *main;
AyStar_Loop *loop; AyStar_Loop *loop;
AyStar_Free *free; void Free();
AyStar_Clear *clear; AyStar_Clear *clear;
AyStar_CheckTile *checktile; AyStar_CheckTile *checktile;