Merge 90c35d6f7a into 677eba847d

2015-08-27 08:53:16 +00:00 · 2015-08-27 08:53:16 +00:00 · 6920c8d303
parent 677eba847d 90c35d6f7a
commit 6920c8d303
4 changed files with 6 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+*.db
--- a/README.txt
+++ b/README.txt
@ -56,6 +56,9 @@ http://creativecommons.org/licenses/by-sa/3.0/
 License of menu/header.png
 Copyright (C) 2013 BlockMen CC BY-3.0

+License of AdventureTest menu/icon
+Copyright (C) 2014 hoodedice CC BY-3.0
+
 License of Spider model
 Copyright (C) 2013 AspireMint CC BY-SA

--- a/menu/icon.png
+++ b/menu/icon.png
--- a/mods/adventuretest/register_functions.lua
+++ b/mods/adventuretest/register_functions.lua
@ -8,7 +8,9 @@ local function adventuretest_globalstep(dtime)
  default.player_globalstep(dtime)
  default.leaf_globalstep(dtime)
  energy_globalstep(dtime)
+if minetest.setting_getbool("enable_damage") then
  hunger.global_step(dtime)
+end
  itemdrop_globalstep(dtime)
  armor_globalstep(dtime)
  wieldview_globalstep(dtime)