cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 22:50:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

removes beam rifle zoom smoothing (#40332)

Browse Source 
* Update beam_rifle.dm

* sometimes complexity is not better

* Update beam_rifle.dm
This commit is contained in:
kevinz000
2018-09-19 12:59:08 +02:00
committed by AnturK
parent 983a38b58a
commit fe3df7231d
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/misc/beam_rifle.dm
-16
View File
@@ -69,7 +69,6 @@
var/zooming_angle
var/current_zoom_x = 0
var/current_zoom_y = 0
var/zoom_animating = 0
var/static/image/charged_overlay = image(icon = 'icons/obj/guns/energy.dmi', icon_state = "esniper_charged")
var/static/image/drained_overlay = image(icon = 'icons/obj/guns/energy.dmi', icon_state = "esniper_empty")
@@ -112,18 +111,6 @@
to_chat(owner, "<span class='boldnotice'>You disable [src]'s zooming system.</span>")
reset_zooming()
/obj/item/gun/energy/beam_rifle/proc/smooth_zooming(delay_override = null)
if(!check_user() || !zooming || zoom_lock == ZOOM_LOCK_OFF || zoom_lock == ZOOM_LOCK_CENTER_VIEW)
return
if(zoom_animating && delay_override != 0)
return smooth_zooming(zoom_animating + delay_override) //Automatically compensate for ongoing zooming actions.
var/total_time = SSfastprocess.wait
if(delay_override)
total_time = delay_override
zoom_animating = total_time
animate(current_user.client, pixel_x = current_zoom_x, pixel_y = current_zoom_y , total_time, SINE_EASING, ANIMATION_PARALLEL)
zoom_animating = 0
/obj/item/gun/energy/beam_rifle/proc/set_autozoom_pixel_offsets_immediate(current_angle)
if(zoom_lock == ZOOM_LOCK_CENTER_VIEW || zoom_lock == ZOOM_LOCK_OFF)
return
@@ -136,7 +123,6 @@
current_user.client.change_view(world.view + zoom_target_view_increase)
zoom_current_view_increase = zoom_target_view_increase
set_autozoom_pixel_offsets_immediate(zooming_angle)
smooth_zooming()
/obj/item/gun/energy/beam_rifle/proc/start_zooming()
if(zoom_lock == ZOOM_LOCK_OFF)
@@ -153,7 +139,6 @@
user = current_user
if(!user || !user.client)
return FALSE
zoom_animating = 0
animate(user.client, pixel_x = 0, pixel_y = 0, 0, FALSE, LINEAR_EASING, ANIMATION_END_NOW)
zoom_current_view_increase = 0
user.client.change_view(CONFIG_GET(string/default_view))
@@ -294,7 +279,6 @@
if(zoom_lock == ZOOM_LOCK_AUTOZOOM_FREEMOVE)
zooming_angle = lastangle
set_autozoom_pixel_offsets_immediate(zooming_angle)
smooth_zooming(2)
return ..()
/obj/item/gun/energy/beam_rifle/onMouseDown(object, location, params, mob/mob)