|
5 | 5 | #endif |
6 | 6 |
|
7 | 7 | #define PLUGIN "Map Manager" |
8 | | -#define VERSION "2.5.56" |
| 8 | +#define VERSION "2.5.57" |
9 | 9 | #define AUTHOR "Mistrick" |
10 | 10 |
|
11 | 11 | #pragma semicolon 1 |
@@ -1460,16 +1460,18 @@ public StartVote(id) |
1460 | 1460 | } |
1461 | 1461 | } |
1462 | 1462 |
|
| 1463 | + new bAllow = get_pcvar_num(g_pCvars[EXTENDED_TYPE]) == 1 && (get_pcvar_num(g_pCvars[MAXROUNDS]) || get_pcvar_num(g_pCvars[WINLIMIT])); |
| 1464 | + |
1463 | 1465 | #if defined FUNCTION_RTV && defined FUNCTION_NIGHTMODE |
1464 | | - if(get_pcvar_float(g_pCvars[TIMELIMIT]) > 0.0 && !g_bRockVote && g_iExtendedMax < get_pcvar_num(g_pCvars[EXTENDED_MAX]) && (g_bNightMode && g_bCurMapInNightMode || !g_bNightMode)) |
| 1466 | + if((get_pcvar_float(g_pCvars[TIMELIMIT]) > 0.0 || bAllow) && !g_bRockVote && g_iExtendedMax < get_pcvar_num(g_pCvars[EXTENDED_MAX]) && (g_bNightMode && g_bCurMapInNightMode || !g_bNightMode)) |
1465 | 1467 | #else |
1466 | 1468 | #if defined FUNCTION_RTV |
1467 | | - if(get_pcvar_float(g_pCvars[TIMELIMIT]) > 0.0 && !g_bRockVote && g_iExtendedMax < get_pcvar_num(g_pCvars[EXTENDED_MAX])) |
| 1469 | + if((get_pcvar_float(g_pCvars[TIMELIMIT]) > 0.0 || bAllow) && !g_bRockVote && g_iExtendedMax < get_pcvar_num(g_pCvars[EXTENDED_MAX])) |
1468 | 1470 | #else |
1469 | 1471 | #if defined FUNCTION_NIGHTMODE |
1470 | | - if(get_pcvar_float(g_pCvars[TIMELIMIT]) > 0.0 && g_iExtendedMax < get_pcvar_num(g_pCvars[EXTENDED_MAX]) && (g_bNightMode && g_bCurMapInNightMode || !g_bNightMode)) |
| 1472 | + if((get_pcvar_float(g_pCvars[TIMELIMIT]) > 0.0 || bAllow) && g_iExtendedMax < get_pcvar_num(g_pCvars[EXTENDED_MAX]) && (g_bNightMode && g_bCurMapInNightMode || !g_bNightMode)) |
1471 | 1473 | #else |
1472 | | - if(get_pcvar_float(g_pCvars[TIMELIMIT]) > 0.0 && g_iExtendedMax < get_pcvar_num(g_pCvars[EXTENDED_MAX])) |
| 1474 | + if((get_pcvar_float(g_pCvars[TIMELIMIT]) > 0.0 || bAllow) && g_iExtendedMax < get_pcvar_num(g_pCvars[EXTENDED_MAX])) |
1473 | 1475 | #endif |
1474 | 1476 | #endif |
1475 | 1477 | #endif |
@@ -1767,19 +1769,18 @@ FinishVote() |
1767 | 1769 |
|
1768 | 1770 | if(get_pcvar_num(g_pCvars[EXTENDED_TYPE]) == 1 && (iWinLimit || iMaxRounds)) |
1769 | 1771 | { |
| 1772 | + new iRounds = get_pcvar_num(g_pCvars[EXTENDED_ROUNDS]); |
| 1773 | + |
1770 | 1774 | if(iWinLimit > 0) |
1771 | 1775 | { |
1772 | | - set_pcvar_num(g_pCvars[WINLIMIT], iWinLimit + get_pcvar_num(g_pCvars[EXTENDED_ROUNDS])); |
| 1776 | + set_pcvar_num(g_pCvars[WINLIMIT], iWinLimit + iRounds); |
1773 | 1777 | } |
1774 | | - |
1775 | 1778 | if(iMaxRounds > 0) |
1776 | 1779 | { |
1777 | | - set_pcvar_num(g_pCvars[MAXROUNDS], iMaxRounds + get_pcvar_num(g_pCvars[EXTENDED_ROUNDS])); |
| 1780 | + set_pcvar_num(g_pCvars[MAXROUNDS], iMaxRounds + iRounds); |
1778 | 1781 | } |
1779 | 1782 |
|
1780 | | - new iRounds = get_pcvar_num(g_pCvars[EXTENDED_ROUNDS]); |
1781 | 1783 | new szRounds[16]; get_ending(iRounds, "MAPM_ROUND1", "MAPM_ROUND2", "MAPM_ROUND3", szRounds, charsmax(szRounds)); |
1782 | | - |
1783 | 1784 | client_print_color(0, print_team_default, "%s^1 %L %L.", PREFIX, LANG_PLAYER, "MAPM_MAP_EXTEND", iRounds, LANG_PLAYER, szRounds); |
1784 | 1785 | } |
1785 | 1786 | else |
|
0 commit comments