summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--src/object.cpp3
-rw-r--r--src/path-search-dijkstra.cpp2
2 files changed, 1 insertions, 4 deletions
diff --git a/src/object.cpp b/src/object.cpp
index 952f5765..001b9dc6 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -33,9 +33,6 @@ constexpr inline Pair<int, int8_t> normalize_coord(const int8_t cur, const int n
bool b = x >= half_tile | x < -half_tile;
int tmask = -(volatile int)b;
int8_t xmask = -(volatile int8_t)b;
-#if defined __GNUG__
- asm volatile ("" : "+r"(tmask), "+r"(xmask));
-#endif
t += s & tmask;
x = (int8_t)((tile_size - a)*-s) & xmask | (int8_t)(x & ~xmask);
return { t, (int8_t)x };
diff --git a/src/path-search-dijkstra.cpp b/src/path-search-dijkstra.cpp
index 32aaff43..79f94e9d 100644
--- a/src/path-search-dijkstra.cpp
+++ b/src/path-search-dijkstra.cpp
@@ -312,7 +312,7 @@ path_search_result astar::Dijkstra(world& w, const point from_, const point to_,
dbg << "found len:" << nodes[goal_idx].dist;
else
{
- dbg << "closest_dist px:" << closest_dist << " path:" << closest_path_len
+ dbg << "closest px:" << closest_dist << " path:" << closest_path_len
<< " pos:" << closest_pos;
}
dbg << " nodes:" << nodes.size();