Improve fps

diff --git a/aether.lua b/aether.lua
index 88d4d983c63f0c30277703b933d173eab353f4ed..bac87674047bb31350f2c39b507595fe4aa9dfb3 100644 (file)
--- a/aether.lua
+++ b/aether.lua
@@ -1,3 +1,6 @@
+local minetest,name = minetest,minetest.localplayer:get_name()
+local aether = minetest.mod_channel_join(name..":aether_teleporters")
+
 --nether teleporters are animation based
 --the animation must finish before the teleport is initialized
 local hud_bg_id = nil --aether portal bg

diff --git a/environment_effects.lua b/environment_effects.lua
index 8b2b6e23c9b3464b02d9e3edb46528a20dbb8398..a71a3e4c560a1b098e346b27610cbc3e77f00e97 100644 (file)
--- a/environment_effects.lua
+++ b/environment_effects.lua
@@ -1,3 +1,5 @@
+local minetest,math = minetest,math
+
 local old_node
 local in_water = false
 local old_in_water = false

diff --git a/fire_handling.lua b/fire_handling.lua
index c47e0e257dfd195fc0f203f4ebde868eb0707f83..a4658de682475fccb6829366facd8b2f1d5ccb14 100644 (file)
--- a/fire_handling.lua
+++ b/fire_handling.lua
@@ -1,3 +1,6 @@
+local minetest,name = minetest,minetest.localplayer:get_name()
+local fire_handling_channel = minetest.mod_channel_join(name..":fire_state")
+
 local on_fire = 0
 local fire_id = nil
 local fire_animation_timer = 0

diff --git a/init.lua b/init.lua
index c9b9da0a89a4cc437e315996aba29ba123951db1..5d645fba7a2be57d90abb38588bd282b1e1e4164 100644 (file)
--- a/init.lua
+++ b/init.lua
@@ -8,27 +8,8 @@ if not minetest.get_node_def("client_version_checker:this_is_the_signature_of_cr
        return
 end
 
---declare globals
-weather_intake = nil
-weather = nil
-weather_type = nil
-player_movement_state = nil
-nether = nil
-aether = nil
-name = nil
-version_channel = nil
-fire_handling_channel = nil
-
 function initialize_all()
        --declare globals for now
-       weather_intake = minetest.mod_channel_join("weather_intake")
-       weather = minetest.mod_channel_join("weather_nodes")
-       weather_type = minetest.mod_channel_join("weather_type")
-       player_movement_state = minetest.mod_channel_join(name..":player_movement_state")
-       nether = minetest.mod_channel_join(name..":nether_teleporters")
-       aether = minetest.mod_channel_join(name..":aether_teleporters")
-       version_channel = minetest.mod_channel_join(name..":client_version_channel")
-       fire_handling_channel = minetest.mod_channel_join(name..":fire_state")
 
        --next we load everything seperately because it's easier to work on individual files than have everything jammed into one file
        --not into seperate mods because that is unnecessary and cumbersome
@@ -49,7 +30,6 @@ end
 local function recursive_startup_attempt()
        local ready_to_go = minetest.localplayer
        if ready_to_go and minetest.get_node_or_nil(minetest.localplayer:get_pos()) then
-               name = minetest.localplayer:get_name()
                --good to begin
                initialize_all()
        else
@@ -62,3 +42,18 @@ end
 
 --begin initial attempt
 recursive_startup_attempt()
+
+--leave mod channels on shutdown
+--[[
+minetest.register_on_shutdown(function()
+       weather_intake = nil
+       weather = nil
+       weather_type = nil
+       player_movement_state = nil
+       nether = nil
+       aether = nil
+       name = nil
+       version_channel = nil
+       fire_handling_channel = nil
+end)
+]]--
\ No newline at end of file

diff --git a/music_handling.lua b/music_handling.lua
index a8291cc42d9af079a6ad1ef1188ae286bc3a2cd8..7915d145dd25e31da2536a76cd2763fe61db3f98 100644 (file)
--- a/music_handling.lua
+++ b/music_handling.lua
@@ -1,3 +1,5 @@
+local minetest,math = minetest,math
+
 song_playing = nil
 local song_tick = 0
 song_index = nil

diff --git a/nether.lua b/nether.lua
index 9d06fddcf8363dc10fbff2e624729731c96d73e2..48103452128840e8819a56cfc0df19e46996fb8a 100644 (file)
--- a/nether.lua
+++ b/nether.lua
@@ -1,3 +1,6 @@
+local minetest,math,name = minetest,math,minetest.localplayer:get_name()
+local nether = minetest.mod_channel_join(name..":nether_teleporters")
+
 --nether teleporters are animation based
 --the animation must finish before the teleport is initialized
 local hud_bg_id = nil --aether portal bg

diff --git a/player_input.lua b/player_input.lua
index 4d8b1e4d0c995eade12c7e3c2c4e9addad540333..d3e9e634bee63010f69a31e64c21925beafb2064 100644 (file)
--- a/player_input.lua
+++ b/player_input.lua
@@ -1,3 +1,5 @@
+local minetest,name = minetest,minetest.localplayer:get_name()
+local player_movement_state = minetest.mod_channel_join(name..":player_movement_state")
 --double tap running
 
 --set up our initial values

diff --git a/version_send.lua b/version_send.lua
index b2e38440a3de2a0dc7b7e8b24d3e0487f54bd7c1..2d286932fd6bbba32f783f6585495bafdaf95aeb 100644 (file)
--- a/version_send.lua
+++ b/version_send.lua
@@ -1,3 +1,5 @@
+local minetest,name = minetest,minetest.localplayer:get_name()
+local version_channel = minetest.mod_channel_join(name..":client_version_channel")
 minetest.after(2,function() -- this needs a few seconds for the mod channel to open up
     version_channel:send_all("0.05008")
 end)
\ No newline at end of file

diff --git a/waila.lua b/waila.lua
index 6059484f9470a739b90e08ee4b1650d6e49f8745..bd8056d455c8e3bd9f8723b21c20626a3a205c58 100644 (file)
--- a/waila.lua
+++ b/waila.lua
@@ -1,6 +1,6 @@
+local minetest,vector = minetest,vector
 local hud_item_name = ""
 
-
 local hud_bg = minetest.localplayer:hud_add({
                                hud_elem_type = "image", -- see HUD element types, default "text"
                                position = {x=0.5, y=0},

diff --git a/weather_handling.lua b/weather_handling.lua
index f4ad3e2c32233d0e7ccd5ead2dc9b94cbe7a3855..4fcebacafe55c3930530ea405d4bf87da90591bb 100644 (file)
--- a/weather_handling.lua
+++ b/weather_handling.lua
@@ -1,3 +1,9 @@
+local minetest,name,vector,math = minetest,minetest.localplayer:get_name(),vector,math
+
+local weather_intake = minetest.mod_channel_join("weather_intake")
+local weather = minetest.mod_channel_join("weather_nodes")
+local weather_type = minetest.mod_channel_join("weather_type")
+
 local all_nodes = {}
 local do_effects = false
 local snow = false