diff --git a/addons/sourcemod/scripting/mapchooser_extended.smx b/addons/sourcemod/scripting/mapchooser_extended.smx new file mode 100644 index 0000000..d70dc59 Binary files /dev/null and b/addons/sourcemod/scripting/mapchooser_extended.smx differ diff --git a/addons/sourcemod/scripting/mapchooser_extended_sounds.smx b/addons/sourcemod/scripting/mapchooser_extended_sounds.smx new file mode 100644 index 0000000..0f64c1f Binary files /dev/null and b/addons/sourcemod/scripting/mapchooser_extended_sounds.smx differ diff --git a/addons/sourcemod/scripting/mapchooser_extended_sounds.sp b/addons/sourcemod/scripting/mapchooser_extended_sounds.sp index 6d7accc..01cbd23 100644 --- a/addons/sourcemod/scripting/mapchooser_extended_sounds.sp +++ b/addons/sourcemod/scripting/mapchooser_extended_sounds.sp @@ -150,28 +150,17 @@ public OnPluginEnd() } */ -/* -* Moved to OnConfigsExecuted due to cvar requirements public OnMapStart() { BuildDownloadsTableAll(); } -*/ + public OnConfigsExecuted() { g_DownloadAllSounds = GetConVarBool(g_Cvar_DownloadAllSounds); SetSoundSetFromCVar(); - - if (g_DownloadAllSounds) - { - BuildDownloadsTableAll(); - } - else - { - BuildDownloadsTable(g_CurrentSoundSet); - } } SetSoundSetFromCVar() diff --git a/addons/sourcemod/scripting/nominations_extended.smx b/addons/sourcemod/scripting/nominations_extended.smx new file mode 100644 index 0000000..0b40502 Binary files /dev/null and b/addons/sourcemod/scripting/nominations_extended.smx differ diff --git a/addons/sourcemod/scripting/nominations_extended.sp b/addons/sourcemod/scripting/nominations_extended.sp index 5b7719e..d16575e 100644 --- a/addons/sourcemod/scripting/nominations_extended.sp +++ b/addons/sourcemod/scripting/nominations_extended.sp @@ -224,14 +224,19 @@ public Action:Command_Nominate(client, args) } decl String:mapname[PLATFORM_MAX_PATH]; - GetCmdArg(1, mapname, sizeof(mapname)); + decl String:displayName[PLATFORM_MAX_PATH]; + GetCmdArg(1, displayName, sizeof(displayName)); new status; - if (!GetTrieValue(g_mapTrie, mapname, status)) + if (FindMap(displayName, mapname, sizeof(mapname)) == FindMap_NotFound) { CReplyToCommand(client, "%t", "Map was not found", mapname); return Plugin_Handled; } + if (!GetTrieValue(g_mapTrie, mapname, status)) { + CReplyToCommand(client, "%t", "Map was not found", mapname); + return Plugin_Handled; + } if ((status & MAPSTATUS_DISABLED) == MAPSTATUS_DISABLED) { diff --git a/addons/sourcemod/scripting/rockthevote_extended.smx b/addons/sourcemod/scripting/rockthevote_extended.smx new file mode 100644 index 0000000..8a934b0 Binary files /dev/null and b/addons/sourcemod/scripting/rockthevote_extended.smx differ diff --git a/addons/sourcemod/scripting/rockthevote_extended.sp b/addons/sourcemod/scripting/rockthevote_extended.sp index 68133cb..64882c5 100644 --- a/addons/sourcemod/scripting/rockthevote_extended.sp +++ b/addons/sourcemod/scripting/rockthevote_extended.sp @@ -132,7 +132,7 @@ public OnClientConnected(client) g_Voted[client] = false; g_Voters++; - g_VotesNeeded = RoundToFloor(float(g_Voters) * GetConVarFloat(g_Cvar_Needed)); + g_VotesNeeded = RoundToCeil(float(g_Voters) * GetConVarFloat(g_Cvar_Needed)); return; } @@ -149,7 +149,7 @@ public OnClientDisconnect(client) g_Voters--; - g_VotesNeeded = RoundToFloor(float(g_Voters) * GetConVarFloat(g_Cvar_Needed)); + g_VotesNeeded = RoundToCeil(float(g_Voters) * GetConVarFloat(g_Cvar_Needed)); if (!g_CanRTV) { diff --git a/addons/sourcemod/translations/ru/mapchooser_extended.phrases.txt b/addons/sourcemod/translations/ru/mapchooser_extended.phrases.txt index b36a295..13b366f 100644 --- a/addons/sourcemod/translations/ru/mapchooser_extended.phrases.txt +++ b/addons/sourcemod/translations/ru/mapchooser_extended.phrases.txt @@ -85,7 +85,7 @@ "ru" "Голосование уже в процессе. Попробуйте через {1} с." } -} "Tie Vote" + "Tie Vote" { "#format" "{1:i}" "ru" "{1} карты набрали одинаковое количество голосов.\nНеобходимо повторное голосование !"