Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
fix bug in scriptapi line_of_sight
fix warnings for pathfinder debug traces
- Loading branch information
Showing
with
6 additions
and
6 deletions.
-
+2
−4
src/pathfinder.cpp
-
+4
−2
src/scriptapi_env.cpp
|
@@ -687,9 +687,8 @@ bool pathfinder::update_all_costs( v3s16 ipos, |
|
|
|
|
|
if ((g_pos2.totalcost < 0) || |
|
|
(g_pos2.totalcost > new_cost)) { |
|
|
int old_cost = g_pos2.totalcost; |
|
|
DEBUG_OUT(LVL "Pathfinder: updating path at: "<< |
|
|
PPOS(ipos2) << " from: " << old_cost << " to "<< |
|
|
PPOS(ipos2) << " from: " << g_pos2.totalcost << " to "<< |
|
|
new_cost << std::endl); |
|
|
if (update_all_costs(ipos2,invert(directions[i]), |
|
|
new_cost,level)) { |
|
@@ -847,9 +846,8 @@ bool pathfinder::update_cost_heuristic( v3s16 ipos, |
|
|
|
|
|
if ((g_pos2.totalcost < 0) || |
|
|
(g_pos2.totalcost > new_cost)) { |
|
|
int old_cost = g_pos2.totalcost; |
|
|
DEBUG_OUT(LVL "Pathfinder: updating path at: "<< |
|
|
PPOS(ipos2) << " from: " << old_cost << " to "<< |
|
|
PPOS(ipos2) << " from: " << g_pos2.totalcost << " to "<< |
|
|
new_cost << " srcdir=" << |
|
|
PPOS(invert(direction))<< std::endl); |
|
|
if (update_cost_heuristic(ipos2,invert(direction), |
|
|
|
@@ -662,9 +662,11 @@ int EnvRef::l_line_of_sight(lua_State *L) { |
|
|
v3f pos2 = checkFloatPos(L, 2); |
|
|
//read step size from lua |
|
|
if(lua_isnumber(L, 3)) |
|
|
stepsize = lua_tonumber(L, 3); |
|
|
stepsize = lua_tonumber(L, 3); |
|
|
|
|
|
return (env->line_of_sight(pos1,pos2,stepsize)); |
|
|
lua_pushboolean(L, env->line_of_sight(pos1,pos2,stepsize)); |
|
|
|
|
|
return 1; |
|
|
} |
|
|
|
|
|
int EnvRef::l_find_path(lua_State *L) |
|
|