switch os.clock to minetest.get_us_time

diff --git a/mods/aether/biomes.lua b/mods/aether/biomes.lua
index 86284272f3fbac38cc9f1a53d5746e510e54e560..90064848fe4a35c0a82147e8127da70adb00362c 100644 (file)
--- a/mods/aether/biomes.lua
+++ b/mods/aether/biomes.lua
@@ -79,7 +79,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
                return
        end
        -- Start time of mapchunk generation.
-       --local t0 = os.clock()
+       --local t0 = minetest.get_us_time()/1000000
        
        -- Noise stuff.
 
@@ -185,6 +185,6 @@ minetest.register_on_generated(function(minp, maxp, seed)
        --vm:update_liquids()
 
        -- Print generation time of this mapchunk.
-       --local chugent = math.ceil((os.clock() - t0) * 1000)
+       --local chugent = math.ceil((minetest.get_us_time()/1000000- t0) * 1000)
        --print ("[lvm_example] Mapchunk generation time " .. chugent .. " ms")
 end)

diff --git a/mods/boat/init.lua b/mods/boat/init.lua
index d01b027c97c3c400f3733d0effdd05c8f360dd6a..29157d395d37f24c9c0904c7f2ef0343838650bb 100644 (file)
--- a/mods/boat/init.lua
+++ b/mods/boat/init.lua
@@ -202,7 +202,7 @@ minetest.register_entity("boat:boat", {
                local pos = self.object:get_pos()
                local velocity = self.object:get_velocity()
                if self.lag_check then
-                       local chugent = math.ceil((os.clock() - self.lag_check) * 1000)
+                       local chugent = math.ceil(minetest.get_us_time()/1000 - self.lag_check)
 
                        --print("lag = "..chugent.." ms")
                        if chugent > 70 and  self.old_pos and self.old_velocity then
@@ -212,7 +212,7 @@ minetest.register_entity("boat:boat", {
                end
                self.old_pos = pos
                self.old_velocity = vel
-               self.lag_check = os.clock()
+               self.lag_check = minetest.get_us_time()/1000
        end,
 
        on_step = function(self, dtime)
@@ -470,7 +470,7 @@ minetest.register_entity("boat:iron_boat", {
                local pos = self.object:get_pos()
                local velocity = self.object:get_velocity()
                if self.lag_check then
-                       local chugent = math.ceil((os.clock() - self.lag_check) * 1000)
+                       local chugent = math.ceil(minetest.get_us_time()/1000- self.lag_check)
 
                        --print("lag = "..chugent.." ms")
                        if chugent > 70 and  self.old_pos and self.old_velocity then
@@ -480,7 +480,7 @@ minetest.register_entity("boat:iron_boat", {
                end
                self.old_pos = pos
                self.old_velocity = vel
-               self.lag_check = os.clock()
+               self.lag_check = minetest.get_us_time()/1000
        end,
 
        on_step = function(self, dtime)

diff --git a/mods/experience/init.lua b/mods/experience/init.lua
index 9f7583ea2daed5083f2f8af257bd4639d522f616..7f3a30cd8065f51287bd1ef78b453bd9af55416a 100644 (file)
--- a/mods/experience/init.lua
+++ b/mods/experience/init.lua
@@ -13,12 +13,12 @@ local load_data = function(player)
                temp_pool.xp_level = mod_storage:get_int(name.."xp_level")
                temp_pool.xp_bar   = mod_storage:get_int(name.."xp_bar"  )
                temp_pool.buffer   = 0
-               temp_pool.last_time= os.clock()
+               temp_pool.last_time= minetest.get_us_time()/1000000
        else
                temp_pool.xp_level = 0
                temp_pool.xp_bar   = 0
                temp_pool.buffer   = 0
-               temp_pool.last_time= os.clock()
+               temp_pool.last_time= minetest.get_us_time()/1000000
        end
 end
 
@@ -189,15 +189,15 @@ local function add_experience(player,experience)
        temp_pool.xp_bar = temp_pool.xp_bar + experience
        
        if temp_pool.xp_bar > 36 then
-               if os.clock() - temp_pool.last_time > 0.04 then
+               if minetest.get_us_time()/1000000 - temp_pool.last_time > 0.04 then
                        minetest.sound_play("level_up",{gain=0.2,to_player = name})
-                       temp_pool.last_time = os.clock()
+                       temp_pool.last_time = minetest.get_us_time()/1000000
                end
         temp_pool.xp_bar = temp_pool.xp_bar - 36
                level_up_experience(player)
        else
-               if os.clock() - temp_pool.last_time > 0.01 then
-                       temp_pool.last_time = os.clock()
+               if minetest.get_us_time()/1000000 - temp_pool.last_time > 0.01 then
+                       temp_pool.last_time = minetest.get_us_time()/1000000
                        minetest.sound_play("experience",{gain=0.1,to_player = name,pitch=math.random(75,99)/100})
                end
        end

diff --git a/mods/nether/biomes.lua b/mods/nether/biomes.lua
index 181ada69d09963d6ecc47cd1ee107c1beabf1501..15e32cba987a8c725f963ffca8aeaea1926f4daf 100644 (file)
--- a/mods/nether/biomes.lua
+++ b/mods/nether/biomes.lua
@@ -129,7 +129,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
                return
        end
        -- Start time of mapchunk generation.
-       --local t0 = os.clock()
+       --local t0 = minetest.get_us_time()/1000000
        
        -- Noise stuff.
 
@@ -228,6 +228,6 @@ minetest.register_on_generated(function(minp, maxp, seed)
        --vm:update_liquids()
 
        -- Print generation time of this mapchunk.
-       --local chugent = math.ceil((os.clock() - t0) * 1000)
+       --local chugent = math.ceil((minetest.get_us_time()/1000000 - t0) * 1000)
        --print ("[lvm_example] Mapchunk generation time " .. chugent .. " ms")
 end)

diff --git a/mods/tnt/init.lua b/mods/tnt/init.lua
index fdb5f3130b8c2d753f6feb847efe3c4c3da35ee7..f43e2541a7f995dc29dbee67fb9d56916bfa9237 100644 (file)
--- a/mods/tnt/init.lua
+++ b/mods/tnt/init.lua
@@ -70,7 +70,7 @@ local hp
 local explosion_force
 local explosion_depletion
 local range_calc
-local boom_time = os.clock()
+local boom_time = minetest.get_us_time()/1000000
 function tnt(pos,range,explosion_type)
        in_node = minetest.get_node(pos).name
        in_water =  ( in_node == "main:water" or minetest.get_node(pos).name == "main:waterflow")
@@ -137,8 +137,8 @@ function tnt(pos,range,explosion_type)
                vm:update_liquids()
                vm:write_to_map()
        end
-       if os.clock() - boom_time >= 0.1 then
-               boom_time = os.clock()
+       if minetest.get_us_time()/1000000 - boom_time >= 0.1 then
+               boom_time = minetest.get_us_time()/1000000
                minetest.sound_play("tnt_explode", {pos = pos, gain = 1.0, max_hear_distance = 64}) --hear twice as far away
        end
        

diff --git a/mods/void/init.lua b/mods/void/init.lua
index 34e49f53bb19b490157e418713dbad923cbd1f1e..2af99997a006b942acb625a9a09250f45069cbb9 100644 (file)
--- a/mods/void/init.lua
+++ b/mods/void/init.lua
@@ -88,7 +88,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
                return
        end
        -- Start time of mapchunk generation.
-       --local t0 = os.clock()
+       --local t0 = minetest.get_us_time()/1000000
        
        -- Noise stuff.
 
@@ -195,6 +195,6 @@ minetest.register_on_generated(function(minp, maxp, seed)
        --vm:update_liquids()
 
        -- Print generation time of this mapchunk.
-       --local chugent = math.ceil((os.clock() - t0) * 1000)
+       --local chugent = math.ceil((minetest.get_us_time()/1000000 - t0) * 1000)
        --print ("[lvm_example] Mapchunk generation time " .. chugent .. " ms")
 end)

diff --git a/mods/weather/init.lua b/mods/weather/init.lua
index 6020407531972779d38d166ceea74b12315c8e60..fc29861bd8fba335fbfb74570e41d53afb8a03e3 100644 (file)
--- a/mods/weather/init.lua
+++ b/mods/weather/init.lua
@@ -199,14 +199,14 @@ local function do_snow()
        if weather_type == 1 then
                for _,player in ipairs(minetest.get_connected_players()) do
                        --this is debug
-                       --local t0 = os.clock()
+                       --local t0 = minetest.get_us_time()/1000000
 
                        pos = round_it(player:get_pos())
                        min = subber(pos, snow_radius)
                        max = adder(pos, snow_radius)
 
                        area_index = under_air(min, max, all_nodes)
-                       --local node_search_time = math.ceil((os.clock() - t0) * 1000)
+                       --local node_search_time = math.ceil((minetest.get_us_time()/1000000 - t0) * 1000)
 
                        spawn_table = {}
 
@@ -310,7 +310,7 @@ local function do_snow()
 
                        --this is debug
                        --[[
-                       local chugent = math.ceil((os.clock() - t0) * 1000)
+                       local chugent = math.ceil((minetest.get_us_time()/1000000 - t0) * 1000)
                        print("---------------------------------")
                        print("find_nodes_in_area_under_air() time: " .. node_search_time .. " ms")
                        print("New Snow generation time:            " .. chugent .. " ms  [" .. (chugent - node_search_time) .. " ms]")