From 65a2126d9fec917fc182015bdd9c94abb534f4d7 Mon Sep 17 00:00:00 2001 From: "elly1989@rocketmail.com" Date: Fri, 23 Nov 2012 00:18:45 +0000 Subject: [PATCH] Should allow savefiles to work. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5167 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/client/preferences.dm | 4 ++-- code/modules/client/preferences_savefile.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 0d9a4e3b806..a61f6d77373 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -89,8 +89,8 @@ datum/preferences if(!IsGuestKey(C.key)) load_path(C.ckey) if(load_preferences()) - load_character() - return + if(load_character()) + return gender = pick(MALE, FEMALE) real_name = random_name(gender) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 44e21d2d246..dc9bf1f6c59 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -18,7 +18,7 @@ if(delpath && fexists(delpath)) fdel(delpath) break - savefile_version = 8 + return 0 if(savefile_version == SAVEFILE_VERSION_MAX) //update successful. save_preferences() @@ -29,6 +29,7 @@ /datum/preferences/proc/load_path(ckey,filename="preferences.sav") if(!ckey) return path = "data/player_saves/[copytext(ckey,1,2)]/[ckey]/[filename]" + savefile_version = SAVEFILE_VERSION_MAX /datum/preferences/proc/load_preferences() if(!path) return 0 @@ -40,7 +41,6 @@ //Conversion if(!savefile_version || !isnum(savefile_version) || savefile_version < SAVEFILE_VERSION_MIN || savefile_version > SAVEFILE_VERSION_MAX) if(!savefile_update()) //handles updates - fdel(path) //handles deleting old files for which an update clause has not been defined savefile_version = SAVEFILE_VERSION_MAX save_preferences() save_character()