From f0de6ac13f92a4883a705496fa9bebd5ac3df669 Mon Sep 17 00:00:00 2001 From: Phil Bordelon Date: Tue, 1 May 2012 18:33:47 -0500 Subject: [PATCH] Constify minimum and maximum player ages. --- code/modules/mob/new_player/preferences.dm | 8 ++++---- code/modules/mob/new_player/preferences_setup.dm | 4 ++-- code/setup.dm | 6 +++++- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm index 09636471459..918e24c9495 100644 --- a/code/modules/mob/new_player/preferences.dm +++ b/code/modules/mob/new_player/preferences.dm @@ -634,11 +634,11 @@ datum/preferences if(link_tags["age"]) switch(link_tags["age"]) if("input") - var/new_age = input(user, "Please select type in age: 20-65", "Character Generation") as num + var/new_age = input(user, "Please enter an age ([minimum_age]-[maximum_age])", "Character Generation") as num if(new_age) - age = max(min(round(text2num(new_age)), 65), 20) + age = max(min(round(text2num(new_age)), maximum_age), minimum_age) if("random") - age = rand (20, 45) + age = rand (minimum_age, maximum_age) if(link_tags["b_type"]) switch(link_tags["b_type"]) @@ -1012,4 +1012,4 @@ datum/preferences character.disabilities = disabilities #undef UI_OLD -#undef UI_NEW \ No newline at end of file +#undef UI_NEW diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index 79a76a6d2f1..1fc8921a9f8 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -15,7 +15,7 @@ datum/preferences underwear = 1 backbag = 2 b_type = pick("A+", "A-", "B+", "B-", "AB+", "AB-", "O+", "O-") - age = rand(20,65) + age = rand(minimum_age, maximum_age) copy_to(H,1) proc/randomize_name() @@ -263,4 +263,4 @@ datum/preferences if(H.name == f_style) facial_hair_style = H else - del(H) \ No newline at end of file + del(H) diff --git a/code/setup.dm b/code/setup.dm index c3e5a03ce55..2f20ff48670 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -282,4 +282,8 @@ var/static/list/scarySounds = list('thudswoosh.ogg','Taser.ogg','armbomb.ogg','h #define SEC_LEVEL_RED 2 #define SEC_LEVEL_DELTA 3 -#define TRANSITIONEDGE 7 //Distance from edge to move to another z-level \ No newline at end of file +#define TRANSITIONEDGE 7 //Distance from edge to move to another z-level + +// Maximum and minimum character ages. +var/const/minimum_age = 20 +var/const/maximum_age = 65