dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: replace printf with fmt::print

Browse Source
This commit is contained in:
Rubidium
2023-05-21 08:04:33 +02:00
committed by rubidium42
parent d57046e7ec
commit c518293135
9 changed files with 49 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -211,7 +211,7 @@ void AyStar::Free()
this->openlist_hash.Delete(true);
this->closedlist_hash.Delete(true);
#ifdef AYSTAR_DEBUG
printf("[AyStar] Memory free'd\n");
Debug(misc, 0, "[AyStar] Memory free'd");
#endif
}
@@ -229,7 +229,7 @@ void AyStar::Clear()
this->closedlist_hash.Clear(true);
#ifdef AYSTAR_DEBUG
printf("[AyStar] Cleared AyStar\n");
Debug(misc, 0, "[AyStar] Cleared AyStar");
#endif
}
@@ -250,9 +250,9 @@ int AyStar::Main()
while ((r = this->Loop()) == AYSTAR_STILL_BUSY && (this->loops_per_tick == 0 || ++i < this->loops_per_tick)) { }
#ifdef AYSTAR_DEBUG
switch (r) {
case AYSTAR_FOUND_END_NODE: printf("[AyStar] Found path!\n"); break;
case AYSTAR_EMPTY_OPENLIST: printf("[AyStar] OpenList run dry, no path found\n"); break;
case AYSTAR_LIMIT_REACHED: printf("[AyStar] Exceeded search_nodes, no path found\n"); break;
case AYSTAR_FOUND_END_NODE: Debug(misc, 0, "[AyStar] Found path!"); break;
case AYSTAR_EMPTY_OPENLIST: Debug(misc, 0, "[AyStar] OpenList run dry, no path found"); break;
case AYSTAR_LIMIT_REACHED: Debug(misc, 0, "[AyStar] Exceeded search_nodes, no path found"); break;
default: break;
}
#endif
@@ -280,7 +280,7 @@ int AyStar::Main()
void AyStar::AddStartNode(AyStarNode *start_node, uint g)
{
#ifdef AYSTAR_DEBUG
printf("[AyStar] Starting A* Algorithm from node (%d, %d, %d)\n",
Debug(misc, 0, "[AyStar] Starting A* Algorithm from node ({}, {}, {})\n",
TileX(start_node->tile), TileY(start_node->tile), start_node->direction);
#endif
this->OpenListAdd(nullptr, start_node, 0, g);

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

@@ -303,29 +303,26 @@ void Hash::PrintStatistics() const
max_usage = usage[collision];
}
}
printf(
"---\n"
"Hash size: %u\n"
"Nodes used: %u\n"
"Non empty buckets: %u\n"
"Max collision: %u\n",
Debug(misc, 0, "Hash size: {}, Nodes used: {}, Non empty buckets: {}, Max collision: {}",
this->num_buckets, this->size, used_buckets, max_collision
);
printf("{ ");
std::string line;
line += "{ ";
for (i = 0; i <= max_collision; i++) {
if (usage[i] > 0) {
printf("%u:%u ", i, usage[i]);
fmt::format_to(std::back_inserter(line), "{}:{} ", i, usage[i]);
#if 0
if (i > 0) {
uint j;
for (j = 0; j < usage[i] * 160 / 800; j++) putchar('#');
for (j = 0; j < usage[i] * 160 / 800; j++) line += "#";
}
printf("\n");
line += "\n";
#endif
}
}
printf ("}\n");
line += "}";
Debug(misc, 0, "{}", line);
}
#endif