From dda2071cc083db2770044db85174a8629a7598b7 Mon Sep 17 00:00:00 2001
From: sapier <Sapier at GMX dot net>
Date: Tue, 9 Apr 2013 20:33:59 +0200
Subject: [PATCH] fix bug in scriptapi line_of_sight fix warnings for
pathfinder debug traces
---
src/pathfinder.cpp | 6 ++----
src/scriptapi_env.cpp | 6 ++++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/pathfinder.cpp b/src/pathfinder.cpp
index c7621177e..0d1cfe476 100644
--- a/src/pathfinder.cpp
+++ b/src/pathfinder.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),
diff --git a/src/scriptapi_env.cpp b/src/scriptapi_env.cpp
index 9bf7f0b55..efed58e66 100644
--- a/src/scriptapi_env.cpp
+++ b/src/scriptapi_env.cpp
@@ -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)
--
GitLab