From 11c4a7d7d074007f33ffcdc71ceb62157ef2c45c Mon Sep 17 00:00:00 2001 From: Duane Date: Tue, 21 Jun 2016 00:38:38 -0500 Subject: [PATCH] Change us_time calls to gametime. --- abms.lua | 6 +++--- armor.lua | 2 +- chat.lua | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/abms.lua b/abms.lua index 9f33ccf..0ba1aa0 100644 --- a/abms.lua +++ b/abms.lua @@ -1,7 +1,7 @@ -- see also, fungal_tree.lua -- player surface damage and hunger -local dps_delay = 3000000 +local dps_delay = 3 local last_dps_check = 0 local cold_delay = 5 @@ -42,7 +42,7 @@ spike_soil['fun_caves:black_sand'] = true -- all the fun_caves globalstep functions ------------------------------------------------------------ minetest.register_globalstep(function(dtime) - local time = minetest.get_us_time() + local time = minetest.get_gametime() -- Execute only after an interval. if last_dps_check and time - last_dps_check < dps_delay then @@ -170,7 +170,7 @@ minetest.register_globalstep(function(dtime) dps_count = hunger_delay end - last_dps_check = minetest.get_us_time() + last_dps_check = minetest.get_gametime() dps_count = dps_count - 1 end) diff --git a/armor.lua b/armor.lua index c447618..ad98c42 100644 --- a/armor.lua +++ b/armor.lua @@ -5,7 +5,7 @@ local function armor(user, factor) user:set_armor_groups({fleshy=factor}) --print(dump(user:get_armor_groups())) minetest.chat_send_player(player_name, 'Your skin feels harder...') - fun_caves.armor_expire[player_name] = minetest.get_us_time() + (3600 * 1000000) + fun_caves.armor_expire[player_name] = minetest.get_gametime() + 3600 end local descs = { diff --git a/chat.lua b/chat.lua index a2112ff..b2b7cb0 100644 --- a/chat.lua +++ b/chat.lua @@ -10,9 +10,9 @@ minetest.register_chatcommand("armor", { for group, value in pairs(armor) do minetest.chat_send_player(name, " "..group.." "..value) end - --print(math.floor(minetest.get_us_time() / (60 * 1000000))) + print(math.floor(minetest.get_gametime() / 60)) if fun_caves.armor_expire and fun_caves.armor_expire[name] then - local min = math.floor((fun_caves.armor_expire[name] - minetest.get_us_time()) / (60 * 1000000)) + local min = math.floor((fun_caves.armor_expire[name] - minetest.get_gametime()) / 60) minetest.chat_send_player(name, "Your elixir will expire in "..min..' minutes.') end end