Merge pull request #4896 from VOREStation/pol-qdels

Fix several Destoy()s
This commit is contained in:
Anewbe
2018-02-21 10:01:23 -06:00
committed by GitHub
8 changed files with 77 additions and 43 deletions

View File

@@ -40,6 +40,10 @@ var/global/list/all_exonet_connections = list()
src.holder = holder
..()
/datum/exonet_protocol/Destroy()
remove_address()
holder = null
return ..()
// Proc: make_address()
// Parameters: 1 (string - used to make into a hash that will be part of the new address)

View File

@@ -1,34 +1,46 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
/datum/data
var/name = "data"
var/size = 1.0
/datum/data/function
name = "function"
size = 2.0
/datum/data/function/data_control
name = "data control"
/datum/data/function/id_changer
name = "id changer"
/datum/data/record
name = "record"
size = 5.0
var/list/fields = list( )
/datum/data/text
name = "text"
var/data = null
/datum/debug
var/list/debuglist
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
/datum/data
var/name = "data"
var/size = 1.0
/datum/data/function
name = "function"
size = 2.0
/datum/data/function/data_control
name = "data control"
/datum/data/function/id_changer
name = "id changer"
/datum/data/record
name = "record"
size = 5.0
var/list/fields = list( )
// Mostly used for data_core records, but unfortuantely used some other places too. But mostly here, so lets make a good effort.
// TODO - Some machines/computers might be holding references to us. Lets look into that, but at least for now lets make sure that the manifest is cleaned up.
/datum/data/record/Destroy(var/force)
if(data_core.locked.Find(src))
if(!force)
crash_with("Someone tried to qdel a record that was in data_core.locked [log_info_line(src)]")
return QDEL_HINT_LETMELIVE
data_core.locked -= src
data_core.medical -= src
data_core.general -= src
data_core.security -= src
. = ..()
/datum/data/text
name = "text"
var/data = null
/datum/debug
var/list/debuglist

View File

@@ -22,8 +22,10 @@
/datum/progressbar/Destroy()
if (client)
client.images -= bar
qdel(bar)
. = ..()
qdel_null(bar)
user = null
client = null
return ..()
/datum/progressbar/proc/update(progress)
//world << "Update [progress] - [goal] - [(progress / goal)] - [((progress / goal) * 100)] - [round(((progress / goal) * 100), 5)]"