Changes a lot of del() to qdel()

This commit is contained in:
Firecage
2015-08-16 23:33:22 +02:00
parent 70b21a0bf7
commit dfae1e0b53
45 changed files with 91 additions and 91 deletions
+1 -1
View File
@@ -8,7 +8,7 @@
var/atmos_supeconductivity = 0
/turf/assume_air(datum/gas_mixture/giver) //use this for machines to adjust air
del(giver)
qdel(giver)
return 0
/turf/return_air()
+1 -1
View File
@@ -45,7 +45,7 @@
if(button)
if(T.client)
T.client.screen -= button
del(button)
qdel(button)
T.actions.Remove(src)
T.update_action_buttons()
owner = null
+4 -4
View File
@@ -178,7 +178,7 @@
probabilities[M.config_tag] = M.probability
if(M.votable)
votable_modes += M.config_tag
del(M)
qdel(M)
votable_modes += "secret"
/datum/configuration/proc/load(filename, type = "config") //the type can also be game_options, in which case it uses a different switch. not making it separate to not copypaste code - Urist
@@ -567,7 +567,7 @@
var/datum/game_mode/M = new T()
if(M.config_tag && M.config_tag == mode_name)
return M
del(M)
qdel(M)
return new /datum/game_mode/extended()
/datum/configuration/proc/get_runnable_modes()
@@ -576,10 +576,10 @@
var/datum/game_mode/M = new T()
//world << "DEBUG: [T], tag=[M.config_tag], prob=[probabilities[M.config_tag]]"
if(!(M.config_tag in modes))
del(M)
qdel(M)
continue
if(probabilities[M.config_tag]<=0)
del(M)
qdel(M)
continue
if(M.can_start())
runnable_modes[M] = probabilities[M.config_tag]
+1 -1
View File
@@ -29,7 +29,7 @@ var/datum/subsystem/radio/radio_controller
frequency.remove_listener(device)
if(frequency.devices.len == 0)
del(frequency)
qdel(frequency)
frequencies -= f_text
return 1
@@ -11,7 +11,7 @@
if(!istype(C.mob, /mob/dead))
log_access("AFK: [key_name(C)]")
C << "<span class='danger'>You have been inactive for more than 10 minutes and have been disconnected.</span>"
del(C)
qdel(C)
if(config.sql_enabled)
sql_poll_players()
+4 -4
View File
@@ -137,7 +137,7 @@ var/datum/subsystem/ticker/ticker
mode = config.pick_mode(master_mode)
if(!mode.can_start())
world << "<B>Unable to start [mode.name].</B> Not enough players, [mode.required_players] players and [mode.required_enemies] eligible antagonists needed. Reverting to pre-game lobby."
del(mode)
qdel(mode)
SSjob.ResetOccupations()
return 0
@@ -148,7 +148,7 @@ var/datum/subsystem/ticker/ticker
if(!Debug2)
if(!can_continue)
del(mode)
qdel(mode)
world << "<B>Error setting up [master_mode].</B> Reverting to pre-game lobby."
SSjob.ResetOccupations()
return 0
@@ -289,8 +289,8 @@ var/datum/subsystem/ticker/ticker
flick("station_intact",cinematic)
world << sound('sound/ambience/signal.ogg')
sleep(100)
if(cinematic) del(cinematic)
if(temp_buckle) del(temp_buckle)
if(cinematic) qdel(cinematic)
if(temp_buckle) qdel(temp_buckle)
return //Faster exit, since nothing happened
else //Station nuked (nuke,explosion,summary)
flick("intro_nuke",cinematic)
+1 -1
View File
@@ -134,7 +134,7 @@
src.ion += law
/datum/ai_laws/proc/clear_inherent_laws()
del(src.inherent)
qdel(src.inherent)
src.inherent = list()
/datum/ai_laws/proc/add_supplied_law(number, law)
+2 -2
View File
@@ -138,7 +138,7 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease
for(var/datum/disease/D in affected_mob.viruses)
if(D != src)
if(IsSame(D))
del(D)
qdel(D)
if(holder == affected_mob)
if(affected_mob.stat != DEAD)
@@ -156,7 +156,7 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease
if(!(type in affected_mob.resistances))
affected_mob.resistances += type
remove_virus()
del(src)
qdel(src)
/datum/disease/New()
+1 -1
View File
@@ -107,7 +107,7 @@ var/list/advance_cures = list(
if(resistance && !(id in affected_mob.resistances))
affected_mob.resistances[id] = id
remove_virus()
del(src) //delete the datum to stop it processing
qdel(src) //delete the datum to stop it processing
// Returns the advance disease with a different reference memory.
/datum/disease/advance/Copy(process = 0)
+1 -1
View File
@@ -321,7 +321,7 @@ What are the archived variables for?
trace_gases += corresponding
corresponding.moles += trace_gas.moles
// del(giver)
// qdel(giver)
return 1
/datum/gas_mixture/remove(amount)
+1 -1
View File
@@ -24,7 +24,7 @@ var/list/modules = list( // global associative list
var/mneed = mods.inmodlist(type) // find if this type has modules defined
if(!mneed) // not found in module list?
del(src) // delete self, thus ending proc
qdel(src) // delete self, thus ending proc
var/needed = mods.getbitmask(type) // get a bitmask for the number of modules in this object
status = needed
+1 -1
View File
@@ -391,7 +391,7 @@
else
qdel(AM)
if(istype(T, /turf/simulated))
del(T)
qdel(T)
/*for(var/atom/movable/bug in src) // If someone (or something) is somehow still in the shuttle's docking area...
if(ismob(bug))
+1 -1
View File
@@ -59,7 +59,7 @@
return
/atom/proc/assume_air(datum/gas_mixture/giver)
del(giver)
qdel(giver)
return null
/atom/proc/remove_air(amount)
+5 -5
View File
@@ -1002,8 +1002,8 @@ var/list/sacrificed = list()
usr.say("Uln Shogg Hafh[pick("'","`")]drn!")
user << "\red You quietly prick your finger and make a pact with the geometer of blood to acquire more power."
user.take_overall_damage(rand(5,20))
del(user.head)
del(user.wear_suit)
qdel(user.head)
qdel(user.wear_suit)
user.equip_to_slot_or_del(new /obj/item/clothing/head/magus(user), slot_head)
user.equip_to_slot_or_del(new /obj/item/clothing/suit/magusred(user), slot_wear_suit)
user.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(user), slot_shoes)
@@ -1020,8 +1020,8 @@ var/list/sacrificed = list()
user.put_in_hands(new /obj/item/weapon/gun/magic/wand/resurrection(user))
if (armorworn == "traveler" || armorworn == "marauder")
usr.say("Tharanak n[pick("'","`")]ghft!")
del(user.head)
del(user.wear_suit)
qdel(user.head)
qdel(user.wear_suit)
user.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/cult(user), slot_head)
user.equip_to_slot_or_del(new /obj/item/clothing/suit/space/cult(user), slot_wear_suit)
user.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(user), slot_shoes)
@@ -1033,7 +1033,7 @@ var/list/sacrificed = list()
if (armorworn == "marauder")
user.spellremove(user)
user.mind.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/creature/cult(user)
del(src)
qdel(src)
return
///Summon Shell: Summons a construct shell if there's four plasteel sheets on top of the rune
+1 -1
View File
@@ -114,7 +114,7 @@
if(G.reroll_friendly)
usable_modes += G
else
del(G)
qdel(G)
if(!usable_modes)
message_admins("Convert_roundtype failed due to no valid modes to convert to. Please report this error to the Coders.")
+2 -2
View File
@@ -78,7 +78,7 @@
if(initial(S.name) == initial(aspell.name))
spell_levels = aspell.spell_level
user.mind.spell_list.Remove(aspell)
del(S)
qdel(S)
return cost * (spell_levels+1)
return -1
/datum/spellbook_entry/proc/GetInfo()
@@ -419,7 +419,7 @@
entries |= E
categories |= E.category
else
del(E)
qdel(E)
tab = categories[1]
/obj/item/weapon/spellbook/New()
+1 -1
View File
@@ -581,7 +581,7 @@
continue
else if(prob(1))
del(R)
qdel(R)
continue
..(severity)
+6 -6
View File
@@ -418,7 +418,7 @@ What a mess.*/
if("Purge All Records")
investigate_log("[usr.name] ([usr.key]) has purged all the security records.", "records")
for(var/datum/data/record/R in data_core.security)
del(R)
qdel(R)
data_core.security.Cut()
temp = "All Security records deleted."
@@ -667,7 +667,7 @@ What a mess.*/
investigate_log("[usr.name] ([usr.key]) has deleted the security records for [active1.fields["name"]].", "records")
if(active2)
data_core.security -= active2
del(active2)
qdel(active2)
if("Delete Record (ALL) Execute")
if(active1)
@@ -675,14 +675,14 @@ What a mess.*/
for(var/datum/data/record/R in data_core.medical)
if((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"]))
data_core.medical -= R
del(R)
qdel(R)
break
data_core.general -= active1
del(active1)
qdel(active1)
if(active2)
data_core.security -= active2
del(active2)
qdel(active2)
else
temp = "This function does not appear to be working at the moment. Our apologies."
@@ -734,7 +734,7 @@ What a mess.*/
continue
else if(prob(1))
del(R)
qdel(R)
continue
..(severity)
@@ -7,7 +7,7 @@
if(master)
master.post_signal(signal, comm_line)
else
del(signal)
qdel(signal)
/datum/computer/file/embedded_program/proc/receive_user_command(command)
+1 -1
View File
@@ -375,7 +375,7 @@
// N, S, E, W are directional
// C is center
// R is random (in magnetic field's bounds)
del(signal)
qdel(signal)
break // break the loop if the character located is invalid
signal.data["command"] = nextmove
+3 -3
View File
@@ -174,8 +174,8 @@
HI.Insert(I, frame=1, delay = 5)
HI.Insert(J, frame=2, delay = 5)
del(I)
del(J)
qdel(I)
qdel(J)
H.icon = HI
H.layer = 25
usr.mapobjs += H
@@ -294,7 +294,7 @@
var/icon/I = imap[i+1]
H.icon = I
del(I)
qdel(I)
H.layer = 25
usr.mapobjs += H
+2 -2
View File
@@ -393,12 +393,12 @@
for(var/obj/item/ITEM in src)
ITEM.clean_blood()
if(istype(STORAGE, /obj/item/weapon/reagent_containers/food))
del(STORAGE)
qdel(STORAGE)
else //It was supercycling, destroy everything
src.HELMET = null
src.SUIT = null
src.MASK = null
del(STORAGE)
qdel(STORAGE)
visible_message("<font color='red'>With a loud whining noise, the Suit Storage Unit's door grinds open. Puffs of ashen smoke come out of its chamber.</font>", 3)
src.isbroken = 1
src.isopen = 1
@@ -197,7 +197,7 @@
temp = "<font color = #336699>- DELETED ENTRY: [D.name] -</font color>"
SelectedServer.log_entries.Remove(D)
del(D)
qdel(D)
else
temp = "<font color = #D70B00>- FAILED: NO SELECTED MACHINE -</font color>"
+3 -3
View File
@@ -137,7 +137,7 @@
loc.assume_air(cabin_air)
air_update_turf()
else
del(cabin_air)
qdel(cabin_air)
cabin_air = null
qdel(spark_system)
spark_system = null
@@ -240,7 +240,7 @@
loc.assume_air(leaked_gas)
air_update_turf()
else
del(leaked_gas)
qdel(leaked_gas)
if(internal_damage & MECHA_INT_SHORT_CIRCUIT)
if(get_charge())
@@ -276,7 +276,7 @@
if(t_air)
t_air.merge(removed)
else //just delete the cabin gas, we're in space or some shit
del(removed)
qdel(removed)
if(occupant)
if(cell)
+3 -3
View File
@@ -300,7 +300,7 @@
const_holder.icon = 'icons/mecha/mech_construction.dmi'
const_holder.icon_state = "gygax0"
const_holder.density = 1
del(src)
qdel(src)
return
@@ -579,7 +579,7 @@
const_holder.icon = 'icons/mecha/mech_construction.dmi'
const_holder.icon_state = "fireripley0"
const_holder.density = 1
del(src)
qdel(src)
return
@@ -801,7 +801,7 @@
var/obj/item/mecha_parts/chassis/const_holder = holder
const_holder.construct = new /datum/construction/mecha/honker(const_holder)
const_holder.density = 1
del(src)
qdel(src)
return
@@ -48,7 +48,7 @@
if(expansion)
qdel(expansion)
expansion = null
del(src)
qdel(src)
//Easier to just call del() than this nonsense
// ya no, del() takes 0.8ds to run on avg. this takes less than 0.01
get_cameras()
+2 -2
View File
@@ -244,10 +244,10 @@
for (var/obj/item/holotape/P in cur)
if(P.icon_state == icon_dir)
N = 0
del(P)
qdel(P)
cur = get_step(cur,dir[i])
del(src)
qdel(src)
return
#undef MAX_TAPE_RANGE
@@ -196,7 +196,7 @@
New(obj/item/sample)
if(!istype(sample))
del(src)
qdel(src)
sample_object = sample
number = 1
@@ -33,7 +33,7 @@
/obj/item/weapon/tank/Destroy()
if(air_contents)
del(air_contents)
qdel(air_contents)
SSobj.processing.Remove(src)
+1 -1
View File
@@ -11,7 +11,7 @@ var/list/admin_ranks = list() //list of all admin_rank datums
switch(name)
if("Removed",null,"")
spawn(-1)
del(src)
qdel(src)
throw EXCEPTION("invalid admin-rank name")
return
if(init_rights) rights = init_rights
+1 -1
View File
@@ -180,7 +180,7 @@
query_tree += val
pos++
del(parser)
qdel(parser)
return querys
+12 -12
View File
@@ -156,7 +156,7 @@ swapmap
if(z2>swapmaps_compiled_maxz ||\
y2>swapmaps_compiled_maxy ||\
x2>swapmaps_compiled_maxx)
del(src)
qdel(src)
return
x2=x?(x):world.maxx
y2=y?(y):world.maxy
@@ -179,12 +179,12 @@ swapmap
if(!M.key) qdel(M)
else M.loc=null
areas[A.loc]=null
del(A)
qdel(A)
// delete areas that belong only to this map
for(var/area/a in areas)
if(a && !a.contents.len) del(a)
if(a && !a.contents.len) qdel(a)
if(x2>=world.maxx || y2>=world.maxy || z2>=world.maxz) CutXYZ()
del(areas)
qdel(areas)
..()
/*
@@ -241,7 +241,7 @@ swapmap
sleep()
S.cd=oldcd
locked=0
del(areas)
qdel(areas)
Read(savefile/S,_id,turf/locorner)
var/x
@@ -297,7 +297,7 @@ swapmap
sleep()
S.cd=oldcd
locked=0
del(areas)
qdel(areas)
/*
Find an empty block on the world map in which to load this map.
@@ -321,7 +321,7 @@ swapmap
x1=l[1]
y1=l[2]
z1=l[3]
del(l)
qdel(l)
x2+=x1-1
y2+=y1-1
z2+=z1-1
@@ -377,7 +377,7 @@ swapmap
// save and delete
proc/Unload()
Save()
del(src)
qdel(src)
proc/Save()
if(id==src) return 0
@@ -472,7 +472,7 @@ atom
l=l.Copy()
for(M in src) if(M.key) l-=M
if(l.len) S["contents"]<<l
if(l!=contents) del(l)
if(l!=contents) qdel(l)
Read(savefile/S)
var/list/l
if(contents.len) l=contents
@@ -485,7 +485,7 @@ atom
if(istext(ic)) icon=swapmaps_iconcache[ic]
if(l && contents!=l)
contents+=l
del(l)
qdel(l)
// set this up (at runtime) as follows:
@@ -625,7 +625,7 @@ proc/SwapMaps_LoadChunk(chunk_id,turf/locorner)
S.cd="//.0"
M.Read(S,M,locorner)
while(M.locked) sleep(1)
del(M)
qdel(M)
return 1
proc/SwapMaps_SaveChunk(chunk_id,turf/corner1,turf/corner2)
@@ -646,7 +646,7 @@ proc/SwapMaps_SaveChunk(chunk_id,turf/corner1,turf/corner2)
M.mode=swapmaps_mode
M.Save()
while(M.locked) sleep(1)
del(M)
qdel(M)
return 1
proc/SwapMaps_GetSize(id)
+4 -4
View File
@@ -24,8 +24,8 @@
var/obj/item/weaponcrafting/ishotgunconstruction/I = new /obj/item/weaponcrafting/ishotgunconstruction
user.unEquip(src)
user.put_in_hands(I)
del(W)
del(src)
qdel(W)
qdel(src)
return
// SHOTGUN //
@@ -57,8 +57,8 @@
var/obj/item/weaponcrafting/ishotgunconstruction3/I = new /obj/item/weaponcrafting/ishotgunconstruction3
user.unEquip(src)
user.put_in_hands(I)
del(W)
del(src)
qdel(W)
qdel(src)
return
/obj/item/weaponcrafting/ishotgunconstruction3
+2 -2
View File
@@ -156,10 +156,10 @@ Gunshots/explosions/opening doors/less rare audio (done)
/obj/effect/hallucination/fake_flood/Destroy()
SSobj.processing.Remove(src)
del(flood_turfs)
qdel(flood_turfs)
if(target.client) target.client.images.Remove(flood_images)
target = null
del(flood_images)
qdel(flood_images)
return
/obj/effect/hallucination/simple/xeno
+1 -1
View File
@@ -686,7 +686,7 @@
H.applyChemicals(S)
S.clear_reagents()
del(S)
qdel(S)
H.update_icon()
if(reagent_source) // If the source wasn't composted and destroyed
reagent_source.update_icon()
+1 -1
View File
@@ -185,7 +185,7 @@
N.amount = max(N.amount - 1, 0)
if (N.amount <= 0)
piles -= N
del(N)
qdel(N)
break
for (var/obj/T in contents)//Now we find the seed we need to vend
+1 -1
View File
@@ -16,7 +16,7 @@
/mob/camera/Destroy()
..()
del(src)
qdel(src)
/mob/camera/Login()
..()
@@ -282,7 +282,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
// Only a certain number of drips (or one large splatter) can be on a given turf.
for(var/obj/effect/decal/cleanable/blood/drip/drop in T)
drips |= drop.drips
del(drop)
qdel(drop)
if(!large && drips.len < 3)
decal_type = /obj/effect/decal/cleanable/blood/drip
+2 -2
View File
@@ -705,7 +705,7 @@ var/list/ai_list = list()
input = input("Select a crew member:") as null|anything in personnel_list
var/icon/character_icon = personnel_list[input]
if(character_icon)
del(holo_icon)//Clear old icon so we're not storing it in memory.
qdel(holo_icon)//Clear old icon so we're not storing it in memory.
holo_icon = getHologramIcon(icon(character_icon))
else
alert("No suitable records found. Aborting.")
@@ -719,7 +719,7 @@ var/list/ai_list = list()
)
input = input("Please select a hologram:") as null|anything in icon_list
if(input)
del(holo_icon)
qdel(holo_icon)
switch(input)
if("default")
holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holo1"))
@@ -168,7 +168,7 @@
if(die)
newHead.Die()
del(src)
qdel(src)
proc/ProcessStomach()
for(var/atom/movable/stomachContent in contents)
@@ -177,16 +177,16 @@
if(!istype(stomachContent,/obj/item/stack/sheet/mineral/plasma))
var/obj/item/stack/oldStack = stomachContent
new /obj/item/stack/sheet/mineral/plasma(src, oldStack.amount)
del(oldStack)
qdel(oldStack)
continue
else if(istype(stomachContent,/obj/item)) //converts to plasma, keeping the w_class
var/obj/item/oldItem = stomachContent
new /obj/item/stack/sheet/mineral/plasma(src, oldItem.w_class)
del(oldItem)
qdel(oldItem)
continue
else
new /obj/item/stack/sheet/mineral/plasma(src, flatPlasmaValue) //just flat amount
del(stomachContent)
qdel(stomachContent)
continue
if(previous)
+1 -1
View File
@@ -30,7 +30,7 @@
client.images = null //remove the images such as AIs being unable to see runes
client.screen = list() //remove hud items just in case
if(hud_used) del(hud_used) //remove the hud objects
if(hud_used) qdel(hud_used) //remove the hud objects
hud_used = new /datum/hud(src)
next_move = 1
+1 -1
View File
@@ -152,7 +152,7 @@
area.power_change()
if(occupier)
malfvacate(1)
del(wires)
qdel(wires)
if(cell)
qdel(cell)
if(terminal)
+1 -1
View File
@@ -34,7 +34,7 @@
if(targloc == curloc)
if(BB.original == user) //if we target ourselves we go straight to bullet_act()
user.bullet_act(BB)
del(BB)
qdel(BB)
return 1
BB.loc = get_turf(user)
BB.starting = get_turf(user)
+1 -1
View File
@@ -243,7 +243,7 @@
new_mob << "<B>Your form morphs into that of a [randomize].</B>"
del(M)
qdel(M)
return new_mob
/obj/item/projectile/magic/animate
+3 -3
View File
@@ -60,7 +60,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
check_tech = new T()
if(check_tech.id == ID)
return_name = check_tech.name
del(check_tech)
qdel(check_tech)
check_tech = null
break
@@ -94,7 +94,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
temp_reagent = new R()
if(temp_reagent.id == ID)
return_name = temp_reagent.name
del(temp_reagent)
qdel(temp_reagent)
temp_reagent = null
break
return return_name
@@ -575,7 +575,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
var/choice = alert("R&D Console Database Reset", "Are you sure you want to reset the R&D console's database? Data lost cannot be recovered.", "Continue", "Cancel")
if(choice == "Continue")
screen = 0.0
del(files)
qdel(files)
files = new /datum/research(src)
spawn(20)
screen = 1.6