Forgot to change the latespawn job proc to check for -1.

Fix for the savefiles, version<5 jobs will now load properly.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2452 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
mport2004@gmail.com
2011-10-30 08:38:11 +00:00
parent 9a2ee43b59
commit 38eac59207
2 changed files with 14 additions and 16 deletions

View File

@@ -211,7 +211,7 @@
proc/IsJobAvailable(rank)
var/datum/job/job = job_master.GetJob(rank)
if(!job) return 0
if(job.current_positions >= job.total_positions) return 0
if((job.current_positions >= job.total_positions) && job.total_positions != -1) return 0
if(jobban_isbanned(src,rank)) return 0
return 1

View File

@@ -1,4 +1,4 @@
#define SAVEFILE_VERSION_MIN 3
#define SAVEFILE_VERSION_MIN 4
#define SAVEFILE_VERSION_MAX 5
datum/preferences/proc/savefile_path(mob/user)
@@ -55,7 +55,6 @@ datum/preferences/proc/savefile_save(mob/user)
F["ooccolor"] << src.ooccolor
F["lastchangelog"] << src.lastchangelog
return 1
// loads the savefile corresponding to the mob's ckey
@@ -104,22 +103,21 @@ datum/preferences/proc/savefile_load(mob/user)
F["UI"] >> src.UI
F["be_special"] >> src.be_special
F["job_civilian_high"] >> src.job_civilian_high
F["job_civilian_med"] >> src.job_civilian_med
F["job_civilian_low"] >> src.job_civilian_low
F["job_medsci_high"] >> src.job_medsci_high
F["job_medsci_med"] >> src.job_medsci_med
F["job_medsci_low"] >> src.job_medsci_low
F["job_engsec_high"] >> src.job_engsec_high
F["job_engsec_med"] >> src.job_engsec_med
F["job_engsec_low"] >> src.job_engsec_low
if(version && version < 5)
convert_hairstyles_four() // convert version 4 hairstyles to version 5
if(version && (version >= SAVEFILE_VERSION_MAX))
F["job_civilian_high"] >> src.job_civilian_high
F["job_civilian_med"] >> src.job_civilian_med
F["job_civilian_low"] >> src.job_civilian_low
F["job_medsci_high"] >> src.job_medsci_high
F["job_medsci_med"] >> src.job_medsci_med
F["job_medsci_low"] >> src.job_medsci_low
F["job_engsec_high"] >> src.job_engsec_high
F["job_engsec_med"] >> src.job_engsec_med
F["job_engsec_low"] >> src.job_engsec_low
style_to_datum() // convert f_style and h_style to /datum