Optimized Sprint Code

Optimied sprint code and general tidying.

init.lua

@@ -108,13 +108,11 @@ end
 -- Sprint settings and function
 local enable_sprint = minetest.setting_getbool("sprint") ~= false
 local enable_sprint_particles = minetest.setting_getbool("sprint_particles") ~= false
-local pp = {}
 local armor_mod = minetest.get_modpath("3d_armor")
 
-function setSprinting(name, sprinting)
+function set_sprinting(name, sprinting)
 
 	if stamina_players[name] then
-		stamina_players[name]["sprinting"] = sprinting
 
 		local player = minetest.get_player_by_name(name)
 		local def = {}
@@ -122,29 +120,29 @@ function setSprinting(name, sprinting)
 			def = armor.def[name] -- get player physics from armor
 		end
 
-		pp.speed = def.speed or 1
+		def.speed = def.speed or 1
-		pp.jump = def.jump or 1
+		def.jump = def.jump or 1
-		pp.gravity = def.gravity or 1
+		def.gravity = def.gravity or 1
 
 		if sprinting == true then
 
 			player:set_physics_override({
-				speed = pp.speed + SPRINT_SPEED,
+				speed = def.speed + SPRINT_SPEED,
-				jump = pp.jump + SPRINT_JUMP,
+				jump = def.jump + SPRINT_JUMP,
-				gravity = pp.gravity
+				gravity = def.gravity
 			})
 
---print ("Speed:", pp.speed + SPRINT_SPEED, "Jump:", pp.jump + SPRINT_JUMP, "Gravity:", pp.gravity)
+--print ("Speed:", def.speed + SPRINT_SPEED, "Jump:", def.jump + SPRINT_JUMP, "Gravity:", def.gravity)
 
 		elseif sprinting == false then
 
 			player:set_physics_override({
-				speed = pp.speed,
+				speed = def.speed,
-				jump = pp.jump,
+				jump = def.jump,
-				gravity = pp.gravity
+				gravity = def.gravity
 			})
 
---print ("Speed:", pp.speed, "Jump:", pp.jump, "Gravity:", pp.gravity)
+--print ("Speed:", def.speed, "Jump:", def.jump, "Gravity:", def.gravity)
 
 		end
 
@@ -173,38 +171,25 @@ local function stamina_globaltimer(dtime)
 			elseif controls.up or controls.down or controls.left or controls.right then
 				exhaust_player(player, STAMINA_EXHAUST_MOVE)
 			end
-		end
-		action_timer = 0
-	end
 
 			--- START sprint
 			if enable_sprint then
 
-		--Loop through all connected players
+				local name = player:get_player_name()
-		for name, info in pairs(stamina_players) do
 
-			local player = minetest.get_player_by_name(name)
+				-- check if player can sprint (stamina must be over 6 points)
-
+				if controls.aux1 and controls.up
-			-- check if player should be sprinting (hunger must be over 6 points)
-			if player
-			and player:get_player_control().aux1
-			and player:get_player_control().up
 				and not minetest.check_player_privs(player, {fast = true})
 				and stamina_players[name].level > 6 then
 
-				stamina_players[name]["shouldSprint"] = true
+					set_sprinting(name, true)
-				setSprinting(name, true)
 
 					-- create particles behind player when sprinting
-				if enable_sprint_particles
+					if enable_sprint_particles then
-				and info["sprinting"] == true then
 
 						local pos = player:getpos()
 						local node = minetest.get_node({
-						x = pos.x,
+							x = pos.x, y = pos.y - 1, z = pos.z})
-						y = pos.y - 1,
-						z = pos.z
-					})
 
 						if node.name ~= "air" then
 
@@ -230,19 +215,18 @@ local function stamina_globaltimer(dtime)
 					end
 
 					-- Lower the player's stamina when sprinting
-				if info["sprinting"] == true then
 					local level = tonumber(stamina_players[name].level)
-					level = level - (SPRINT_DRAIN * STAMINA_MOVE_TICK)
+					stamina_update(player, level - (SPRINT_DRAIN * STAMINA_MOVE_TICK))
-					stamina_update(player, level)
-				end
 				else
-				stamina_players[name]["shouldSprint"] = false
+					set_sprinting(name, false)
-				setSprinting(name, false)
-			end
 				end
 			end
 			-- END sprint
 
+		end
+		action_timer = 0
+	end
+
 	-- lower saturation by 1 point after STAMINA_TICK second(s)
 	if stamina_timer > STAMINA_TICK then
 		for _,player in ipairs(minetest.get_connected_players()) do
@@ -407,4 +391,3 @@ if minetest.setting_getbool("enable_damage") and minetest.is_yes(minetest.settin
 		stamina_update(player, STAMINA_VISUAL_MAX)
 	end)
 end
-