From daac550822f985e311564a6d7e3563465cd31f4c Mon Sep 17 00:00:00 2001 From: Mloc Date: Mon, 12 Nov 2012 21:54:16 +0000 Subject: [PATCH] Revert movement speed changer glide thing I DONT KNOW THE NAME AAAH. Signed-off-by: Mloc --- code/modules/mob/mob_defines.dm | 5 +---- code/modules/mob/mob_movement.dm | 30 +++++------------------------- 2 files changed, 6 insertions(+), 29 deletions(-) diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 8f615d3c883..407be5f25c1 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -3,7 +3,6 @@ layer = 4.0 animate_movement = 2 // flags = NOREACT - glide_size = 8 var/datum/mind/mind var/stat = 0 //Whether a mob is alive or dead. TODO: Move this to living - Nodrak @@ -227,6 +226,4 @@ var/has_limbs = 1 //Whether this mob have any limbs he can move with var/can_stand = 1 //Whether this mob have ability to stand - var/immune_to_ssd = 0 -//Animation speed changer - var/lastmovementdelay = 0 \ No newline at end of file + var/immune_to_ssd = 0 \ No newline at end of file diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 887ae13e271..068241967d3 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -282,29 +282,18 @@ return 0 move_delay = world.time//set move delay - var/mdelay = 0 switch(mob.m_intent) if("run") if(mob.drowsyness > 0) - mdelay += 6 - mdelay += 2+config.run_speed + move_delay += 6 + move_delay += 1+config.run_speed if("walk") - mdelay += 7+config.walk_speed + move_delay += 7+config.walk_speed + move_delay += mob.movement_delay() if(config.Tickcomp) - mdelay -= 1.3 + move_delay -= 1.3 var/tickcomp = ((1/(world.tick_lag))*1.3) - mdelay += tickcomp - - move_delay += mdelay - - mob.UpdateGlide(mdelay) - if (mob.pulling) - if (istype(mob.pulling,/mob)) - var/mob/M = mob.pulling - M.UpdateGlide(mdelay) - else - mob.pulling.glide_size = mob.glide_size //We are now going to move moving = 1 @@ -326,7 +315,6 @@ else diag = null if ((get_dist(mob, M) > 1 || diag)) - M.UpdateGlide(mdelay) step(M, get_dir(M.loc, T)) else for(var/mob/M in L) @@ -335,7 +323,6 @@ M.animate_movement = 3 for(var/mob/M in L) spawn( 0 ) - M.UpdateGlide(mdelay) step(M, direct) return spawn( 1 ) @@ -514,10 +501,3 @@ prob_slip = round(prob_slip) return(prob_slip) - -//Updates Glide_size of mob according to its speed. -/mob/proc/UpdateGlide(var/mdelay = 2) - if (mdelay != lastmovementdelay) - lastmovementdelay = mdelay - glide_size = 32*(world.tick_lag)/lastmovementdelay - //src << "Debug: Your new glide speed is [glide_size]" \ No newline at end of file