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

(svn r20880) -Codechange: Make Hash_Size a method.

release/1.1
alberth 2010-10-02 19:38:22 +00:00
parent a7ffc9a268
commit 6ea5643e40
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,7 +182,7 @@ int AyStar::Loop()
/* Free the node */ /* Free the node */
free(current); free(current);
if (this->max_search_nodes != 0 && Hash_Size(&this->ClosedListHash) >= this->max_search_nodes) { if (this->max_search_nodes != 0 && this->ClosedListHash.GetSize() >= this->max_search_nodes) {
/* We've expanded enough nodes */ /* We've expanded enough nodes */
return AYSTAR_LIMIT_REACHED; return AYSTAR_LIMIT_REACHED;
} else { } else {

5
src/pathfinder/npf/queue.cpp
View File

@ -511,8 +511,3 @@ void *Hash_Get(const Hash *h, uint key1, uint key2)
#endif #endif
return (node != NULL) ? node->value : NULL; return (node != NULL) ? node->value : NULL;
} }
uint Hash_Size(const Hash *h)
{
return h->size;
}

12
src/pathfinder/npf/queue.h
View File

@ -85,6 +85,14 @@ struct Hash {
/* A pointer to an array of numbuckets booleans, which will be true if /* A pointer to an array of numbuckets booleans, which will be true if
* there are any Nodes in the bucket */ * there are any Nodes in the bucket */
bool *buckets_in_use; bool *buckets_in_use;
/**
* Gets the current size of the hash.
*/
uint FORCEINLINE GetSize() const
{
return this->size;
}
}; };
/* Call these function to manipulate a hash */ /* Call these function to manipulate a hash */
@ -123,9 +131,5 @@ void delete_Hash(Hash *h, bool free_values);
* Cleans the hash, but keeps the memory allocated * Cleans the hash, but keeps the memory allocated
*/ */
void clear_Hash(Hash *h, bool free_values); void clear_Hash(Hash *h, bool free_values);
/**
* Gets the current size of the Hash
*/
uint Hash_Size(const Hash *h);
#endif /* QUEUE_H */ #endif /* QUEUE_H */