Skip to content

scheduler: add unlimited mode for CVar mapm_extended_map_max #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 5, 2022
Merged

scheduler: add unlimited mode for CVar mapm_extended_map_max #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0b114c7
scheduler: add unlimited mode for CVar `mapm_extended_map_max`
Nord1cWarr1or Sep 6, 2021
72e742d
Merge branch 'Mistrick:master' into unlimited-extend
Nord1cWarr1or Jan 2, 2022
19ef4bc
Merge branch 'Mistrick:master' into unlimited-extend
Nord1cWarr1or Jan 5, 2022
641f840
scheduler: update for "extend_map_no_votes" logic
Nord1cWarr1or Jan 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cstrike/addons/amxmodx/configs/map_manager.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ mapm_default_map "de_dust2"
mapm_extended_type "0"

// Максимальное число продлений карты mapm_extended_type "0".
// -1 - бесконечное число продлений
mapm_extended_map_max "3"

// Продление в минутах mapm_extended_type "1".
Expand Down
8 changes: 6 additions & 2 deletions cstrike/addons/amxmodx/scripting/map_manager_scheduler.sma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,10 @@ public mapm_can_be_extended(type)
if(type == VOTE_BY_SCHEDULER_SECOND) {
return EXTEND_BLOCKED;
}
if(g_iExtendedNum >= get_num(EXTENDED_MAX)) {

new extended_max = get_num(EXTENDED_MAX);

if(g_iExtendedNum >= extended_max && extended_max != -1) {
return EXTEND_BLOCKED;
}
return EXTEND_ALLOWED;
Expand Down Expand Up @@ -499,8 +502,9 @@ public mapm_vote_finished(const map[], type, total_votes)
g_bVoteInNewRound = false;

new extend_map_no_votes = get_num(EXTEND_MAP_IF_NO_VOTES);
new extended_max = get_num(EXTENDED_MAX);

new bool:can_be_extend = bool:(equali(map, g_sCurMap) || !total_votes && extend_map_no_votes && g_iExtendedNum < get_num(EXTENDED_MAX));
new bool:can_be_extend = bool:(equali(map, g_sCurMap) || !total_votes && extend_map_no_votes && g_iExtendedNum < extended_max && extended_max != -1);

// map extended
if(can_be_extend) {
Expand Down