cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-25 09:31:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaner click parameter handling

Browse Source
This commit is contained in:
mwerezak
2015-02-08 19:42:18 -05:00
parent 9e62e08d2e
commit a679d22db8
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/modules/projectiles/gun.dm
View File

@@ -134,16 +134,9 @@
y_offset = rand(-1,1)
x_offset = rand(-1,1)
var/p_x
var/p_y
if(params)
var/list/mouse_control = params2list(params)
if(mouse_control["icon-x"])
p_x = text2num(mouse_control["icon-x"])
if(mouse_control["icon-y"])
p_y = text2num(mouse_control["icon-y"])
if(in_chamber)
if(params) in_chamber.set_clickpoint(params)
var/fail = in_chamber.launch(
target = target,
user = user,

12
code/modules/projectiles/projectile.dm
View File

@@ -81,8 +81,16 @@
del(in_chamber) //No need for it anymore
return output //Send it back to the gun!
//sets the click point of the projectile using mouse input params
/obj/item/projectile/proc/set_clickpoint(var/params)
var/list/mouse_control = params2list(params)
if(mouse_control["icon-x"])
p_x = text2num(mouse_control["icon-x"])
if(mouse_control["icon-y"])
p_y = text2num(mouse_control["icon-y"])
//called to launch a projectile from a gun
/obj/item/projectile/proc/launch(atom/target, mob/user, obj/item/weapon/gun/launcher, var/target_zone, var/x_offset=0, var/y_offset=0, var/px=null, var/py=null)
/obj/item/projectile/proc/launch(atom/target, mob/user, obj/item/weapon/gun/launcher, var/target_zone, var/x_offset=0, var/y_offset=0)
var/turf/curloc = get_turf(user)
var/turf/targloc = get_turf(target)
if (!istype(targloc) || !istype(curloc))
@@ -106,8 +114,6 @@
current = curloc
yo = targloc.y - curloc.y + y_offset
xo = targloc.x - curloc.x + x_offset
if(!isnull(py)) p_y = py
if(!isnull(px)) p_x = px
shot_from = launcher
silenced = launcher.silenced