Fix digitigrade vars being set to null, made some comments as to type int over bool

This commit is contained in:
Raeschen
2021-09-12 19:08:58 +02:00
parent d7f7779eec
commit 9b6603e7aa
4 changed files with 14 additions and 6 deletions

View File

@@ -1,5 +1,5 @@
/datum/dna /datum/dna
var/digitigrade = 0 var/digitigrade = 0 //0, Not FALSE, for future use as indicator for digitigrade types (0 = None, 1 = default, 2 = digitigrade birdfeet, ...ect)
/datum/dna/Clone() /datum/dna/Clone()
. = ..() . = ..()

View File

@@ -8,7 +8,12 @@
if(character.species.digi_allowed) if(character.species.digi_allowed)
character.digitigrade = pref.digitigrade character.digitigrade = pref.digitigrade
else else
character.digitigrade = FALSE character.digitigrade = 0
//sanity check
if(character.digitigrade == null)
character.digitigrade = 0
pref.digitigrade = 0
/datum/category_item/player_setup_item/general/body/OnTopic(var/href,var/list/href_list, var/mob/user) /datum/category_item/player_setup_item/general/body/OnTopic(var/href,var/list/href_list, var/mob/user)
if(href_list["digitigrade"]) if(href_list["digitigrade"])
@@ -26,3 +31,7 @@
/datum/category_item/player_setup_item/general/body/save_character(var/savefile/S) /datum/category_item/player_setup_item/general/body/save_character(var/savefile/S)
. = ..() . = ..()
S["digitigrade"] << pref.digitigrade //CHOMPEdit S["digitigrade"] << pref.digitigrade //CHOMPEdit
/datum/category_item/player_setup_item/general/body/sanitize_character(var/savefile/S)
. = ..()
pref.digitigrade = sanitize_integer(pref.digitigrade, 0, 1, initial(pref.digitigrade))

View File

@@ -1,2 +1,2 @@
/datum/preferences /datum/preferences
var/digitigrade = 0 var/digitigrade = 0 // 0 = no digi, 1 = default, 2+ = digi styles... (Not used yet)

View File

@@ -2,5 +2,4 @@
var/gender_change_cooldown = 0 // A cooldown for gender and gender indentify changing procs to make it easy to avoid spam of gender change var/gender_change_cooldown = 0 // A cooldown for gender and gender indentify changing procs to make it easy to avoid spam of gender change
var/loneliness_stage = 0 var/loneliness_stage = 0
var/next_loneliness_time = 0 var/next_loneliness_time = 0
var/digitigrade = 0 var/digitigrade = 0 // 0 = no digi, 1 = default, 2+ = digi styles... (Not used yet)