aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Zhuravlev <zhuravlevilya@ya.ru>2014-01-12 22:07:35 +0400
committerIlya Zhuravlev <zhuravlevilya@ya.ru>2014-01-13 03:29:12 +0400
commita4c5f10ecf4fd49cfbf73580b00c0b4f12ee40cf (patch)
treee4a4b754b31211ab8a8d5c7a97ba34e90373d1d3
parenta358c040f2d6d1fe6825121bf8ab57ceb5865cc9 (diff)
downloadminetest-a4c5f10ecf4fd49cfbf73580b00c0b4f12ee40cf.tar.gz
minetest-a4c5f10ecf4fd49cfbf73580b00c0b4f12ee40cf.tar.bz2
minetest-a4c5f10ecf4fd49cfbf73580b00c0b4f12ee40cf.zip
Fix some errors reported by clang static analyzer.
-rw-r--r--src/environment.cpp3
-rw-r--r--src/script/lua_api/l_object.cpp3
2 files changed, 5 insertions, 1 deletions
diff --git a/src/environment.cpp b/src/environment.cpp
index 034db00d5..5249dd9ec 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -1005,7 +1005,8 @@ void ServerEnvironment::clearAllObjects()
}
num_blocks_checked++;
- if(num_blocks_checked % report_interval == 0){
+ if(report_interval != 0 &&
+ num_blocks_checked % report_interval == 0){
float percent = 100.0 * (float)num_blocks_checked /
loadable_blocks.size();
infostream<<"ServerEnvironment::clearAllObjects(): "
diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp
index 457d8ea7b..6d4ce54fc 100644
--- a/src/script/lua_api/l_object.cpp
+++ b/src/script/lua_api/l_object.cpp
@@ -944,12 +944,15 @@ int ObjectRef::l_hud_change(lua_State *L)
case HUD_STAT_DIR:
e->dir = lua_tonumber(L, 4);
value = &e->dir;
+ break;
case HUD_STAT_ALIGN:
e->align = read_v2f(L, 4);
value = &e->align;
+ break;
case HUD_STAT_OFFSET:
e->offset = read_v2f(L, 4);
value = &e->offset;
+ break;
}
getServer(L)->hudChange(player, id, stat, value);