From 76b9fbb874590a58c4e536f5be17a9bd4d7fc1dd Mon Sep 17 00:00:00 2001 From: Incoming Date: Mon, 23 Feb 2015 23:34:17 -0500 Subject: [PATCH 1/2] popcaphotfix: misused a max that could have rendered the hard popcap useless --- code/modules/mob/new_player/new_player.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index d228a9df1b7..3f81826c816 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -126,7 +126,11 @@ if(!ticker || ticker.current_state != GAME_STATE_PLAYING) usr << "The round is either not ready, or has already finished..." return - var/relevent_cap = max(config.hard_popcap, config.extreme_popcap) + var/relevent_cap + if(config.hard_popcap && config.extreme_popcap) + relevent_cap = min(config.hard_popcap, config.extreme_popcap) + else + relevent_cap = max(config.hard_popcap, config.extreme_popcap) if(relevent_cap && living_player_count() >= relevent_cap && !(ckey(key) in admin_datums)) usr << "[config.hard_popcap_message]" return From 0bf960588815cca8d665b77e9eb58f5c5ed0efb6 Mon Sep 17 00:00:00 2001 From: Incoming Date: Tue, 24 Feb 2015 16:19:21 -0500 Subject: [PATCH 2/2] spellang councet --- code/modules/mob/new_player/new_player.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 3f81826c816..040a14f7802 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -126,12 +126,12 @@ if(!ticker || ticker.current_state != GAME_STATE_PLAYING) usr << "The round is either not ready, or has already finished..." return - var/relevent_cap + var/relevant_cap if(config.hard_popcap && config.extreme_popcap) - relevent_cap = min(config.hard_popcap, config.extreme_popcap) + relevant_cap = min(config.hard_popcap, config.extreme_popcap) else - relevent_cap = max(config.hard_popcap, config.extreme_popcap) - if(relevent_cap && living_player_count() >= relevent_cap && !(ckey(key) in admin_datums)) + relevant_cap = max(config.hard_popcap, config.extreme_popcap) + if(relevant_cap && living_player_count() >= relevant_cap && !(ckey(key) in admin_datums)) usr << "[config.hard_popcap_message]" return LateChoices()