diff --git a/CS2Fixes.vcxproj b/CS2Fixes.vcxproj
index 518203e9..0e7069f3 100644
--- a/CS2Fixes.vcxproj
+++ b/CS2Fixes.vcxproj
@@ -214,12 +214,14 @@
+
+
diff --git a/CS2Fixes.vcxproj.filters b/CS2Fixes.vcxproj.filters
index b8829d18..5fda5ecb 100644
--- a/CS2Fixes.vcxproj.filters
+++ b/CS2Fixes.vcxproj.filters
@@ -1,4 +1,4 @@
-
+
@@ -205,5 +205,11 @@
Header Files
+
+ Header Files
+
+
+ Header Files
+
\ No newline at end of file
diff --git a/cfg/cs2fixes/cs2fixes.cfg b/cfg/cs2fixes/cs2fixes.cfg
index 2e06e266..cde9d8cf 100644
--- a/cfg/cs2fixes/cs2fixes.cfg
+++ b/cfg/cs2fixes/cs2fixes.cfg
@@ -31,6 +31,8 @@ cs2f_extend_success_ratio 0.5 // Ratio needed to pass an extend
cs2f_extend_time 20 // Time to add per extend
cs2f_rtv_success_ratio 0.6 // Ratio needed to pass RTV
cs2f_rtv_endround 0 // Whether to immediately end the round when RTV succeeds
+cs2f_vote_maps_cooldown 10 // Number of maps to wait until a map can be voted / nominated again i.e. cooldown.
+cs2f_vote_max_nominations 10 // Number of nominations to include per vote, out of a maximum of 10.
// Ztele settings
zr_ztele_max_distance 150.0 // Maximum distance players are allowed to move after starting ztele
diff --git a/configs/admins.cfg.example b/configs/admins.cfg.example
index 4237ce3f..ba5000e0 100644
--- a/configs/admins.cfg.example
+++ b/configs/admins.cfg.example
@@ -23,9 +23,9 @@ Admins
{
// Admin entries should follow this format
- //"name" // Unused, can be anything
- //{
- // "steamid" "1234567890" // SteamID64
- // "flags" "abcdefg" // Permission flags as described above
- //}
+ //"name" // Unused, can be anything
+ //{
+ // "steamid" "1234567890" // SteamID64
+ // "flags" "abcdefg" // Permission flags as described above
+ //}
}
\ No newline at end of file
diff --git a/configs/maplist.cfg.example b/configs/maplist.cfg.example
index 79c02493..29f003d7 100644
--- a/configs/maplist.cfg.example
+++ b/configs/maplist.cfg.example
@@ -1,18 +1,18 @@
"Maplist"
{
- "ze_my_first_ze_map"
- {
- "workshop_id" "123"
- "enabled" "1"
- }
- "ze_my_second_ze_map"
- {
- "workshop_id" "456"
- "enabled" "1"
- }
- "ze_my_thirdd_ze_map"
- {
- "workshop_id" "789"
- "enabled" "1"
- }
+ "ze_my_first_ze_map"
+ {
+ "workshop_id" "123"
+ "enabled" "1"
+ }
+ "ze_my_second_ze_map"
+ {
+ "workshop_id" "456"
+ "enabled" "1"
+ }
+ "ze_my_thirdd_ze_map"
+ {
+ "workshop_id" "789"
+ "enabled" "1"
+ }
}
\ No newline at end of file
diff --git a/src/commands.cpp b/src/commands.cpp
index 1ec2f7db..10e6b7c8 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -757,26 +757,18 @@ CON_COMMAND_CHAT(http, "test an HTTP request")
{
if (!g_http)
{
- if (player)
- ClientPrint(player, HUD_PRINTTALK, CHAT_PREFIX "Steam HTTP interface is not available!");
- else
- Message("Steam HTTP interface is not available!\n");
-
+ ClientPrint(player, HUD_PRINTTALK, CHAT_PREFIX "Steam HTTP interface is not available!");
return;
}
if (args.ArgC() < 3)
{
- if (player)
- ClientPrint(player, HUD_PRINTTALK, CHAT_PREFIX "Usage: !http [content]");
- else
- Message("Usage: !http [content]\n");
-
+ ClientPrint(player, HUD_PRINTTALK, CHAT_PREFIX "Usage: !http [content]");
return;
}
- if (strcmp(args[1], "get") == 0)
+ if (!V_strcmp(args[1], "get"))
g_HTTPManager.GET(args[2], &HttpCallback);
- else if (strcmp(args[1], "post") == 0)
+ else if (!V_strcmp(args[1], "post"))
g_HTTPManager.POST(args[2], args[3], &HttpCallback);
}
diff --git a/src/events.cpp b/src/events.cpp
index c3d96a0f..f9e64223 100644
--- a/src/events.cpp
+++ b/src/events.cpp
@@ -23,9 +23,9 @@
#include "ctimer.h"
#include "eventlistener.h"
#include "entity/cbaseplayercontroller.h"
+#include "playermanager.h"
#include "tier0/memdbgon.h"
-#include "playermanager.h"
extern IGameEventManager2 *g_gameEventManager;
extern IServerGameClients *g_pSource2GameClients;
diff --git a/src/map_votes.cpp b/src/map_votes.cpp
index dffd1c2c..e50ab966 100644
--- a/src/map_votes.cpp
+++ b/src/map_votes.cpp
@@ -73,7 +73,7 @@ CON_COMMAND_F(cs2f_vote_max_nominations, "Number of nominations to include per v
}
}
-CON_COMMAND_CHAT_FLAGS(setnextmap, "Force next map", ADMFLAG_ROOT)
+CON_COMMAND_CHAT_FLAGS(setnextmap, "Force next map", ADMFLAG_CHANGEMAP)
{
bool bIsClearingForceNextMap = args.ArgC() < 2;
int iResponse = g_pMapVoteSystem->ForceNextMap(bIsClearingForceNextMap ? "" : args[1]);
@@ -123,7 +123,7 @@ static int __cdecl OrderStringsLexicographically(const char* const* a, const cha
return V_strcasecmp(*a, *b);
}
-CON_COMMAND_CHAT_FLAGS(maplist, "List the maps in the server", ADMFLAG_NONE)
+CON_COMMAND_CHAT(maplist, "List the maps in the server")
{
ClientPrint(player, HUD_PRINTTALK, CHAT_PREFIX "The list of all maps will be shown in console.");
ClientPrint(player, HUD_PRINTCONSOLE, "The list of all maps is:");
@@ -137,7 +137,7 @@ CON_COMMAND_CHAT_FLAGS(maplist, "List the maps in the server", ADMFLAG_NONE)
}
}
-CON_COMMAND_CHAT_FLAGS(nomlist, "List the list of nominations", ADMFLAG_NONE)
+CON_COMMAND_CHAT(nomlist, "List the list of nominations")
{
ClientPrint(player, HUD_PRINTTALK, CHAT_PREFIX "Current nominations:");
for (int i = 0; i < g_pMapVoteSystem->GetMapListSize(); i++) {
@@ -149,7 +149,7 @@ CON_COMMAND_CHAT_FLAGS(nomlist, "List the list of nominations", ADMFLAG_NONE)
}
}
-CON_COMMAND_CHAT_FLAGS(mapcooldowns, "List the maps currently in cooldown", ADMFLAG_NONE)
+CON_COMMAND_CHAT(mapcooldowns, "List the maps currently in cooldown")
{
ClientPrint(player, HUD_PRINTTALK, CHAT_PREFIX "The list of maps in cooldown will be shown in console.");
ClientPrint(player, HUD_PRINTCONSOLE, "The list of maps in cooldown is:");