From 96c790a81f2684c7abddb00f5c78b8d61857a2c7 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 2 Sep 2017 05:23:35 -0500 Subject: [PATCH] Unruntimes fdel on savefiles --- code/controllers/subsystem/persistence.dm | 6 +++--- code/modules/mob/living/carbon/monkey/punpun.dm | 4 ++-- code/modules/mob/living/simple_animal/friendly/cat.dm | 2 +- code/modules/mob/living/simple_animal/friendly/dog.dm | 2 +- .../mob/living/simple_animal/hostile/megafauna/colossus.dm | 2 +- code/modules/mob/living/simple_animal/parrot.dm | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm index 97c569b99b..0137953a65 100644 --- a/code/controllers/subsystem/persistence.dm +++ b/code/controllers/subsystem/persistence.dm @@ -26,7 +26,7 @@ SUBSYSTEM_DEF(persistence) var/savefile/secret_satchels = new /savefile("data/npc_saves/SecretSatchels.sav") var/sav_text secret_satchels[SSmapping.config.map_name] >> sav_text - fdel(secret_satchels) + fdel("data/npc_saves/SecretSatchels.sav") if(sav_text) old_secret_satchels = splittext(sav_text,"#") if(old_secret_satchels.len >= 20) @@ -79,7 +79,7 @@ SUBSYSTEM_DEF(persistence) if(!saved_json) return saved_messages = json_decode(saved_json) - fdel(chisel_messages_sav) + fdel("data/npc_saves/ChiselMessages.sav") else var/json_file = file("data/npc_saves/ChiselMessages[SSmapping.config.map_name].json") if(!fexists(json_file)) @@ -124,7 +124,7 @@ SUBSYSTEM_DEF(persistence) if(!saved_json) return saved_trophies = json_decode(saved_json) - fdel(S) + fdel("data/npc_saves/TrophyItems.sav") else var/json_file = file("data/npc_saves/TrophyItems.json") if(!fexists(json_file)) diff --git a/code/modules/mob/living/carbon/monkey/punpun.dm b/code/modules/mob/living/carbon/monkey/punpun.dm index da7ec5f186..2cf821093d 100644 --- a/code/modules/mob/living/carbon/monkey/punpun.dm +++ b/code/modules/mob/living/carbon/monkey/punpun.dm @@ -42,13 +42,13 @@ ..() /mob/living/carbon/monkey/punpun/proc/Read_Memory() - if(fexists("data/npc_saves/Punpun.sav")) + if(fexists("data/npc_saves/Punpun.sav")) //legacy compatability to convert old format to new var/savefile/S = new /savefile("data/npc_saves/Punpun.sav") S["ancestor_name"] >> ancestor_name S["ancestor_chain"] >> ancestor_chain S["relic_hat"] >> relic_hat S["relic_mask"] >> relic_mask - fdel(S) + fdel("data/npc_saves/Punpun.sav") else var/json_file = file("data/npc_saves/Punpun.json") if(!fexists(json_file)) diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index bea25ebe6d..0e0b811810 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -116,7 +116,7 @@ if(fexists("data/npc_saves/Runtime.sav")) //legacy compatability to convert old format to new var/savefile/S = new /savefile("data/npc_saves/Runtime.sav") S["family"] >> family - fdel(S) + fdel("data/npc_saves/Runtime.sav") else var/json_file = file("data/npc_saves/Runtime.json") if(!fexists(json_file)) diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm index 370244f9d3..244e77d33a 100644 --- a/code/modules/mob/living/simple_animal/friendly/dog.dm +++ b/code/modules/mob/living/simple_animal/friendly/dog.dm @@ -333,7 +333,7 @@ S["age"] >> age S["record_age"] >> record_age S["saved_head"] >> saved_head - fdel(S) + fdel("data/npc_saves/Ian.sav") else var/json_file = file("data/npc_saves/Ian.json") if(!fexists(json_file)) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index 78616fe007..66fd219358 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -292,7 +292,7 @@ Difficulty: Very Hard if(fexists("data/npc_saves/Blackbox.sav")) //legacy compatability to convert old format to new var/savefile/S = new /savefile("data/npc_saves/Blackbox.sav") S["stored_items"] >> stored_items - fdel(S) + fdel("data/npc_saves/Blackbox.sav") else var/json_file = file("data/npc_saves/Blackbox.json") if(!fexists(json_file)) diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index cd96dd2be8..a70a60a809 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -930,7 +930,7 @@ S["roundssurvived"] >> rounds_survived S["longestsurvival"] >> longest_survival S["longestdeathstreak"] >> longest_deathstreak - fdel(S) + fdel("data/npc_saves/Poly.sav") else var/json_file = file("data/npc_saves/Poly.json") if(!fexists(json_file))