Skip to content

Commit e763482

Browse files
committed
nomination: add note about removed maps
1 parent 6662387 commit e763482

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

cstrike/addons/amxmodx/data/lang/mapmanager.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ MAPM_NOM_CANT_NOM2 = All nomination slots reserved.
2020
MAPM_NOM_MAP = %s^1 nominated^3 %s^1.
2121
MAPM_NOM_NOMINATED_LIST = Nominated maps:
2222
MAPM_NOM_NOMINATED_NOTHING = No nominated maps.
23+
MAPM_NOM_REMOVED_MAPS = These nominated maps have been removed from the vote: ^4%s
2324
MAPM_MENU_FAST_NOM = Found some maps:
2425
MAPM_MENU_MAP_LIST = Maps list
2526
MAPM_MENU_BACK = Back
@@ -73,6 +74,7 @@ MAPM_NOM_CANT_NOM2 = Nie mozesz nominowac juz wiecej map.
7374
MAPM_NOM_MAP = %s^1 nominowal^3 %s^1.
7475
MAPM_NOM_NOMINATED_LIST = Nominated maps:
7576
MAPM_NOM_NOMINATED_NOTHING = No nominated maps.
77+
MAPM_NOM_REMOVED_MAPS = These nominated maps have been removed from the vote: ^4%s
7678
MAPM_MENU_FAST_NOM = Szybka nominacja map:
7779
MAPM_MENU_MAP_LIST = Lista map
7880
MAPM_MENU_BACK = Wroc
@@ -126,6 +128,7 @@ MAPM_NOM_CANT_NOM2 = Уже номинировано максимальное ч
126128
MAPM_NOM_MAP = %s^1 номинировал на голосование^3 %s^1.
127129
MAPM_NOM_NOMINATED_LIST = Номинированные карты:
128130
MAPM_NOM_NOMINATED_NOTHING = Нет номинированных карт.
131+
MAPM_NOM_REMOVED_MAPS = Эти номинированные карты были исключены из голосования: ^4%s
129132
MAPM_MENU_FAST_NOM = Найдено несколько карт:
130133
MAPM_MENU_MAP_LIST = Список карт
131134
MAPM_MENU_BACK = Назад

cstrike/addons/amxmodx/scripting/map_manager_nomination.sma

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#endif
1010

1111
#define PLUGIN "Map Manager: Nomination"
12-
#define VERSION "0.3.6"
12+
#define VERSION "0.3.7"
1313
#define AUTHOR "Mistrick"
1414

1515
#pragma semicolon 1
@@ -587,16 +587,33 @@ public mapm_prepare_votelist(type)
587587
}
588588
new nom_info[NomStruct];
589589
new max_items = mapm_get_votelist_size();
590+
new Array:a = ArrayCreate(MAPNAME_LENGTH, 0);
590591
for(new i = mapm_get_count_maps_in_vote(), index; i < max_items && ArraySize(g_aNomList); i++) {
591592
index = random_num(0, ArraySize(g_aNomList) - 1);
592593
ArrayGetArray(g_aNomList, index, nom_info);
593594
ArrayDeleteItem(g_aNomList, index);
594595
g_iNomMaps[nom_info[NomPlayer]]--;
595596

596-
if(mapm_push_map_to_votelist(nom_info[NomMap], PUSH_BY_NOMINATION) != PUSH_SUCCESS) {
597+
result = mapm_push_map_to_votelist(nom_info[NomMap], PUSH_BY_NOMINATION);
598+
if(result != PUSH_SUCCESS) {
597599
i--;
600+
if(result == PUSH_BLOCKED) {
601+
ArrayPushString(a, nom_info[NomMap]);
602+
}
603+
}
604+
}
605+
606+
new size = ArraySize(a);
607+
if(size) {
608+
new removed_maps[192], map[MAPNAME_LENGTH], len;
609+
for(new i; i < size; i++) {
610+
ArrayGetString(a, i, map, charsmax(map));
611+
len += formatex(removed_maps[len], charsmax(removed_maps) - len, "%s, ", map);
598612
}
613+
removed_maps[len - 2] = 0;
614+
client_print_color(0, print_team_default, "%s ^1%L.", g_sPrefix, LANG_PLAYER, "MAPM_NOM_REMOVED_MAPS", removed_maps);
599615
}
616+
ArrayDestroy(a);
600617
}
601618

602619
map_nominated(map[])

0 commit comments

Comments
 (0)