-tg- atom pooling system, qdel changes

This commit first and foremost ports the -tg- atom pooling system, and
removes the old experimental system entirely.

Secondly, this PR modifies the qdel system to use a -tg- lookalike
"destroy hint" system, which means that individual objects can tell qdel
what to do with them beyond taking care of things they need to delete.
This ties into the atom pooling system via a new hint define,
QDEL_HINT_PUTINPOOL, which will place the atom in the pool instead of
deleting it as per standard.

Emitter beams are now fully pooled.

Qdel now has semi-compatibility with all datum types, however it is not
the same as -tg-'s "Queue everything!" system. It simply passes it through
the GC immediately and adds it to the "hard del" lists. This means that
reagents can be qdel'ed, but there is no purpose as of yet, as it is more
or less the same as just deleting them, with the added effect of adding
logs of them being deleted to the garbage collector.
This commit is contained in:
Tigercat2000
2015-06-21 15:47:57 -07:00
parent 4481968c5d
commit d20298e996
149 changed files with 379 additions and 367 deletions
+2 -2
View File
@@ -35,7 +35,7 @@
var/turf/T = loc
loc = null
T.relativewall_neighbours()
..()
return ..()
/obj/structure/alien/resin/Move()
var/turf/T = loc
@@ -182,7 +182,7 @@
loc = null
for (var/obj/structure/alien/weeds/W in range(1,T))
W.updateWeedOverlays()
..()
return ..()
/obj/structure/alien/weeds/proc/Life()
set background = BACKGROUND_ENABLED
+1 -1
View File
@@ -17,7 +17,7 @@ var/list/obj/effect/bump_teleporter/BUMP_TELEPORTERS = list()
/obj/effect/bump_teleporter/Destroy()
BUMP_TELEPORTERS -= src
..()
return ..()
/obj/effect/bump_teleporter/Bumped(atom/user)
if(!ismob(user))
+5 -7
View File
@@ -62,8 +62,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
//if (istype(T, /turf))
// T.firelevel = 0 //TODO: FIX
src.delete()
..()
return
return ..()
/obj/effect/effect/water/Move(turf/newloc)
//var/turf/T = src.loc
@@ -183,8 +182,7 @@ steam.start() -- spawns the effect
var/turf/T = src.loc
if (istype(T, /turf))
T.hotspot_expose(1000,100)
..()
return
return ..()
/obj/effect/effect/sparks/Move()
..()
@@ -960,7 +958,7 @@ steam.start() -- spawns the effect
if(A == src)
continue
reagents.reaction(A, 1, 1)
..()
return ..()
/obj/effect/effect/foam/process()
if(--amount < 0)
@@ -1249,8 +1247,8 @@ steam.start() -- spawns the effect
var/turf/T = src.loc
if (istype(T, /turf))
T.hotspot_expose(3000,100)
..()
return
return ..()
/obj/effects/sparkels/Move()
..()
var/turf/T = src.loc
+1 -1
View File
@@ -51,7 +51,7 @@
/obj/effect/glowshroom/Destroy()
processing_objects -= src
..()
return ..()
/obj/effect/glowshroom/process()
if(!spreaded)
+1 -1
View File
@@ -99,7 +99,7 @@
/obj/effect/landmark/Destroy()
landmarks_list -= src
..()
return ..()
/obj/effect/landmark/nations
name = "nations"
+1 -1
View File
@@ -220,4 +220,4 @@
src.visible_message("<span class='danger'>\The [src] splits open.</span>")
for(var/atom/movable/A in contents)
A.loc = src.loc
..()
return ..()
+1 -1
View File
@@ -63,7 +63,7 @@
/* BROKEN, FUCK BYOND
if(hasvar(src, "my_atom"))
src:my_atom = null*/
..()
return ..()
/obj/item/device
icon = 'icons/obj/device.dmi'
+2 -2
View File
@@ -1300,7 +1300,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
explosion(T, -1, -1, 2, 3)
JFLOG("Exploded")
del(src)
qdel(src)
return
/obj/item/device/pda/Destroy()
@@ -1310,7 +1310,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
src.id.loc = get_turf(src.loc)
if(src.pai)
src.pai.loc = get_turf(src.loc)
..()
return ..()
/obj/item/device/pda/clown/Crossed(AM as mob|obj) //Clown PDA is slippery.
if (istype(AM, /mob/living/carbon))
+4 -4
View File
@@ -26,7 +26,7 @@
/obj/item/radio/integrated/Destroy()
if(radio_controller)
radio_controller.remove_object(src, control_freq)
..()
return ..()
/obj/item/radio/integrated/proc/post_signal(var/freq, var/key, var/value, var/key2, var/value2, var/key3, var/value3,var/key4, var/value4, s_filter)
@@ -48,7 +48,7 @@
signal.data[key4] = value4
frequency.post_signal(src, signal, filter = s_filter)
return
/obj/item/radio/integrated/receive_signal(datum/signal/signal)
@@ -139,7 +139,7 @@
/obj/item/radio/integrated/mule/Destroy()
if(radio_controller)
radio_controller.remove_object(src,beacon_freq)
..()
return ..()
// receive radio signals
// can detect bot status signals
@@ -237,7 +237,7 @@
/obj/item/radio/integrated/signal/Destroy()
if(radio_controller)
radio_controller.remove_object(src, frequency)
..()
return ..()
/obj/item/radio/integrated/signal/initialize()
if (src.frequency < 1441 || src.frequency > 1489)
@@ -234,19 +234,19 @@ obj/item/device/flashlight/lamp/bananalamp
/obj/item/device/flashlight/emp/New()
..()
processing_objects.Add(src)
..()
processing_objects.Add(src)
/obj/item/device/flashlight/emp/Destroy()
processing_objects.Remove(src)
..()
processing_objects.Remove(src)
return ..()
/obj/item/device/flashlight/emp/process()
charge_tick++
if(charge_tick < 10) return 0
charge_tick = 0
emp_cur_charges = min(emp_cur_charges+1, emp_max_charges)
return 1
charge_tick++
if(charge_tick < 10) return 0
charge_tick = 0
emp_cur_charges = min(emp_cur_charges+1, emp_max_charges)
return 1
/obj/item/device/flashlight/emp/attack(mob/living/M as mob, mob/living/user as mob)
if(on && user.zone_sel.selecting == "eyes") // call original attack proc only if aiming at the eyes
+1 -1
View File
@@ -18,7 +18,7 @@
/obj/item/device/guitar/Destroy()
del(song)
song = null
..()
return ..()
/obj/item/device/guitar/attack_self(mob/user as mob)
interact(user)
+1 -1
View File
@@ -18,7 +18,7 @@
//Will stop people throwing friend pAIs into the singularity so they can respawn
if(!isnull(pai))
pai.death(0)
..()
return ..()
/obj/item/device/paicard/attack_self(mob/user)
if (!in_range(src, user))
@@ -25,6 +25,7 @@
else if(S.part2 == src)
S.part2 = null
master = null
return ..()
/obj/item/device/radio/electropack/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
..()
@@ -32,7 +32,7 @@
/obj/item/device/radio/intercom/Destroy()
processing_objects.Remove(src)
..()
return ..()
/obj/item/device/radio/intercom/attack_ai(mob/user as mob)
add_hiddenprint(user)
+1 -1
View File
@@ -37,7 +37,7 @@ REAGENT SCANNER
/obj/item/device/t_scanner/Destroy()
if(on)
processing_objects.Remove(src)
..()
return ..()
/obj/item/device/t_scanner/attack_self(mob/user)
+1 -1
View File
@@ -17,7 +17,7 @@
/obj/item/device/violin/Destroy()
del(song)
song = null
..()
return ..()
/obj/item/device/violin/attack_self(mob/user as mob)
interact(user)
@@ -8,7 +8,7 @@
..()
if (istype(W, /obj/item/weapon/wrench) && sheets_refunded)
//new /obj/item/stack/sheet/metal( get_turf(src.loc), sheets_refunded )
var/obj/item/stack/sheet/metal/M = getFromPool(/obj/item/stack/sheet/metal, get_turf(src))
var/obj/item/stack/sheet/metal/M = PoolOrNew(/obj/item/stack/sheet/metal, get_turf(src))
M.amount = sheets_refunded
qdel(src)
+1 -1
View File
@@ -24,7 +24,7 @@
/obj/item/stack/Destroy()
if (src && usr && usr.machine==src)
usr << browse(null, "window=stack")
..()
return ..()
/obj/item/stack/examine()
set src in view(1)
@@ -22,7 +22,7 @@
/obj/item/weapon/chrono_eraser/Destroy()
dropped()
..()
return ..()
/obj/item/weapon/chrono_eraser/ui_action_click()
var/mob/living/carbon/user = src.loc
@@ -77,7 +77,7 @@
TED = null
if(field)
field_disconnect(field)
..()
return ..()
/obj/item/weapon/gun/energy/chrono_gun/proc/field_connect(var/obj/effect/chrono_field/F)
var/mob/living/user = src.loc
@@ -177,7 +177,7 @@
/obj/effect/chrono_field/Destroy()
if(gun && gun.field_check(src))
gun.field_disconnect(src)
..()
return ..()
/obj/effect/chrono_field/update_icon()
var/ttk_frame = 1 - (tickstokill / initial(tickstokill))
+1 -1
View File
@@ -37,7 +37,7 @@ LIGHTERS ARE IN LIGHTERS.DM
create_reagents(chem_volume) // making the cigarrete a chemical holder with a maximum volume of 30
/obj/item/clothing/mask/cigarette/Destroy()
..()
. = ..()
del(reagents)
/obj/item/clothing/mask/cigarette/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+1 -2
View File
@@ -165,9 +165,8 @@
if(on)
var/M = get(paddles, /mob)
remove_paddles(M)
..()
. = ..()
update_icon()
return
/obj/item/weapon/defibrillator/proc/deductcharge(var/chrgdeductamt)
if(bcell)
@@ -29,7 +29,7 @@
qdel(igniter)
if(ptank)
qdel(ptank)
..()
return ..()
/obj/item/weapon/flamethrower/process()
+4 -2
View File
@@ -21,7 +21,6 @@
return (BRUTELOSS)
/obj/item/weapon/shard/New()
src.icon_state = pick("large", "medium", "small")
switch(src.icon_state)
if("small")
@@ -34,7 +33,10 @@
src.pixel_x = rand(-5, 5)
src.pixel_y = rand(-5, 5)
else
return
..()
/obj/item/weapon/shard/Destroy()
return QDEL_HINT_PUTINPOOL
/obj/item/weapon/shard/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/weldingtool))
@@ -183,7 +183,7 @@
/obj/item/weapon/storage/fancy/cigarettes/Destroy()
del(reagents)
..()
return ..()
/obj/item/weapon/storage/fancy/cigarettes/update_icon()
@@ -37,7 +37,7 @@
processing_objects.Remove(src)
..()
return ..()
/obj/item/weapon/tank/examine()
var/obj/icon = src
@@ -66,8 +66,7 @@
remove_noz()
qdel(noz)
noz = null
..()
return
return ..()
/obj/item/weapon/watertank/attack_hand(mob/user as mob)
if(src.loc == user)
+2 -2
View File
@@ -444,7 +444,7 @@ obj/item/weapon/twohanded/
/obj/item/weapon/twohanded/singularityhammer/Destroy()
processing_objects.Remove(src)
..()
return ..()
/obj/item/weapon/twohanded/singularityhammer/process()
@@ -567,7 +567,7 @@ obj/item/weapon/twohanded/
/obj/item/weapon/twohanded/knighthammer/Destroy()
processing_objects.Remove(src)
..()
return ..()
/obj/item/weapon/twohanded/knighthammer/process()
+2 -1
View File
@@ -48,7 +48,8 @@
/obj/Destroy()
machines -= src
processing_objects -= src
..()
return ..()
/obj/item/proc/is_used_on(obj/O, mob/user)
/obj/proc/process()
+1 -1
View File
@@ -26,7 +26,7 @@
/obj/structure/Destroy()
if(hascall(src, "unbuckle"))
src:unbuckle()
..()
return ..()
/obj/structure/mech_melee_attack(obj/mecha/M)
if(M.damtype == "brute")
@@ -26,7 +26,7 @@
// Fix for #383 - C4 deleting fridges with corpses
/obj/structure/closet/Destroy()
dump_contents()
..()
return ..()
/obj/structure/closet/alter_health()
return get_turf(src)
+4 -4
View File
@@ -98,7 +98,7 @@
/obj/structure/displaycase/ex_act(severity)
switch(severity)
if (1)
getFromPool(/obj/item/weapon/shard, loc)
PoolOrNew(/obj/item/weapon/shard, loc)
if (occupant)
dump()
del(src)
@@ -121,13 +121,13 @@
/obj/structure/displaycase/blob_act()
if (prob(75))
getFromPool(/obj/item/weapon/shard, loc)
PoolOrNew(/obj/item/weapon/shard, loc)
if(occupant) dump()
del(src)
/obj/structure/displaycase/meteorhit(obj/O as obj)
getFromPool(/obj/item/weapon/shard, loc)
PoolOrNew(/obj/item/weapon/shard, loc)
if(occupant) dump()
del(src)
@@ -137,7 +137,7 @@
if (!( src.destroyed ))
src.density = 0
src.destroyed = 1
getFromPool(/obj/item/weapon/shard, loc)
PoolOrNew(/obj/item/weapon/shard, loc)
playsound(get_turf(src), "shatter", 70, 1)
update_icon()
else
+1 -1
View File
@@ -37,7 +37,7 @@
for(var/obj/structure/falsewall/W in range(temploc,1))
W.relativewall()
..()
return ..()
/obj/structure/falsewall/relativewall()
+8 -9
View File
@@ -37,17 +37,16 @@
icon='icons/fence-ns.dmi'
/obj/structure/grille/Destroy()
loc = null //garbage collect
return QDEL_HINT_PUTINPOOL //pool grilles
/obj/structure/grille/ex_act(severity)
returnToPool(src)
qdel(src)
/obj/structure/grille/blob_act()
returnToPool(src)
qdel(src)
/obj/structure/grille/meteorhit(var/obj/M)
returnToPool(src)
qdel(src)
/obj/structure/grille/Bumped(atom/user)
@@ -144,7 +143,7 @@
if(!shock(user, 100))
playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1)
new /obj/item/stack/rods(loc, 2)
returnToPool(src)
qdel(src)
else if((isscrewdriver(W)) && (istype(loc, /turf/simulated) || anchored))
if(!shock(user, 90))
playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1)
@@ -224,12 +223,12 @@
icon_state = "brokengrille"
density = 0
destroyed = 1
new /obj/item/stack/rods(loc)
PoolOrNew(/obj/item/stack/rods,loc)
else
if(health <= -6)
new /obj/item/stack/rods(loc)
returnToPool(src)
PoolOrNew(/obj/item/stack/rods,loc)
qdel(src)
return
return
+4 -4
View File
@@ -13,7 +13,7 @@
/obj/structure/lamarr/ex_act(severity)
switch(severity)
if (1)
getFromPool(/obj/item/weapon/shard, loc)
PoolOrNew(/obj/item/weapon/shard, loc)
Break()
qdel(src)
if (2)
@@ -35,13 +35,13 @@
/obj/structure/lamarr/blob_act()
if (prob(75))
getFromPool(/obj/item/weapon/shard, loc)
PoolOrNew(/obj/item/weapon/shard, loc)
Break()
qdel(src)
/obj/structure/lamarr/meteorhit(obj/O as obj)
getFromPool(/obj/item/weapon/shard, loc)
PoolOrNew(/obj/item/weapon/shard, loc)
Break()
qdel(src)
@@ -51,7 +51,7 @@
if (!( src.destroyed ))
src.density = 0
src.destroyed = 1
getFromPool(/obj/item/weapon/shard, loc)
PoolOrNew(/obj/item/weapon/shard, loc)
playsound(src, "shatter", 70, 1)
Break()
else
+1 -1
View File
@@ -30,7 +30,7 @@
if(locate(/obj/structure/lattice, get_step(src, dir)))
L = locate(/obj/structure/lattice, get_step(src, dir))
L.updateOverlays(src.loc)
..()
return ..()
/obj/structure/lattice/blob_act()
qdel(src)
+2 -2
View File
@@ -21,7 +21,7 @@
/datum/song/Destroy()
instrumentObj = null
return
return ..()
// note is a number from 1-7 for A-G
// acc is either "b", "n", or "#"
@@ -320,7 +320,7 @@
/obj/structure/piano/Destroy()
del(song)
song = null
..()
return ..()
/obj/structure/piano/attack_hand(mob/user as mob)
interact(user)
@@ -27,8 +27,7 @@
/obj/structure/stool/bed/Destroy()
unbuckle()
..()
return
return ..()
/obj/structure/stool/bed/attack_hand(mob/user as mob)
manual_unbuckle(user)
+3 -3
View File
@@ -42,7 +42,7 @@
/obj/structure/table/Destroy()
update_adjacent()
..()
return ..()
/obj/structure/table/proc/destroy()
new parts(loc)
@@ -725,9 +725,9 @@
/obj/structure/table/glass/proc/collapse() //glass table collapse is called twice in this code, more efficent to just have a proc
src.visible_message("<span class='warning'>\The [src] shatters, and the frame collapses!</span>", "<span class='warning'>You hear metal collapsing and glass shattering.</span>")
new /obj/item/weapon/table_parts/glass(loc)
getFromPool(/obj/item/weapon/shard, loc)
PoolOrNew(/obj/item/weapon/shard, loc)
if(prob(50)) //50% chance to spawn two shards
getFromPool(/obj/item/weapon/shard, loc)
PoolOrNew(/obj/item/weapon/shard, loc)
qdel(src)
/obj/structure/table/glass/attackby(obj/item/I as obj, mob/user as mob, params)
@@ -23,7 +23,7 @@
/obj/structure/transit_tube/station/Destroy()
processing_objects -= src
..()
return ..()
// Stations which will send the tube in the opposite direction after their stop.
/obj/structure/transit_tube/station/reverse
@@ -21,9 +21,9 @@
/obj/structure/transit_tube_pod/Destroy()
for(var/atom/movable/AM in contents)
AM.loc = loc
AM.forceMove(get_turf(src))
..()
return ..()
/obj/structure/transit_tube_pod/proc/follow_tube(var/reverse_launch)
if(moving)
@@ -35,7 +35,7 @@ obj/structure/windoor_assembly/New(dir=NORTH)
obj/structure/windoor_assembly/Destroy()
density = 0
air_update_turf(1)
..()
return ..()
/obj/structure/windoor_assembly/Move()
var/turf/T = loc
+3 -3
View File
@@ -53,7 +53,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
// This should result in the same materials used to make the window.
/obj/structure/window/proc/destroy()
for(var/i=0;i<sheets;i++)
getFromPool(shardtype, loc)
PoolOrNew(shardtype, loc)
if(reinf)
new /obj/item/stack/rods(loc)
@@ -223,7 +223,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
else if(istype(W, /obj/item/weapon/wrench) && !anchored && health > 7) //Disassemble deconstructed window into parts
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
for(var/i=0;i<sheets;i++)
var/obj/item/stack/sheet/glass/NG = getFromPool(glasstype, src.loc)
var/obj/item/stack/sheet/glass/NG = PoolOrNew(glasstype, src.loc)
for (var/obj/item/stack/sheet/glass/G in src.loc) //Stack em up
if(G==NG)
continue
@@ -335,7 +335,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
air_update_turf(1)
if(loc && !disassembled)
playsound(get_turf(src), "shatter", 70, 1)
..()
return ..()
/obj/structure/window/Move()