core: set nextmap in maps load

move cmd mapm_start_vote for scheduler
hide some debug info
scheduler: added cmd mapm_stop_vote

Author: Mistrick

map_manager_blocklist.sma

@@ -75,7 +75,7 @@ load_blocklist()
 		temp = fopen(temp_file_path, "wt");
 
 		new buffer[40], map[MAPNAME_LENGTH], str_count[6], count;
-		server_print("Blocked list:^n%s", cur_map);
+		// server_print("Blocked list:^n%s", cur_map);
 		while(!feof(f)) {
 			fgets(f, buffer, charsmax(buffer));
 			parse(buffer, map, charsmax(map), str_count, charsmax(str_count));
@@ -89,7 +89,7 @@ load_blocklist()
 
 			fprintf(temp, "^"%s^" ^"%d^"^n", map, count);
 			TrieSetCell(g_tBlockedList, map, count);
-			server_print("%s", map);
+			// server_print("%s", map);
 		}
 
 		fprintf(temp, "^"%s^" ^"%d^"^n", cur_map, BLOCK_MAP_COUNT);

map_manager_core.sma

@@ -5,7 +5,6 @@
 	- start/stop vote
 */
 #include <amxmodx>
-#include <amxmisc>
 #include <map_manager_consts>
 #include <map_manager_stocks>
 
@@ -102,8 +101,6 @@ public plugin_init()
 	g_pCvars[PREPARE_TIME] = register_cvar("mapm_prepare_time", "5"); // seconds
 	g_pCvars[VOTE_TIME] = register_cvar("mapm_vote_time", "10"); // seconds
 
-	register_concmd("mapm_start_vote", "concmd_startvote", ADMIN_MAP);
-
 	g_hForwards[MAPLIST_LOADED] = CreateMultiForward("mapm_maplist_loaded", ET_IGNORE, FP_CELL);
 	g_hForwards[PREPARE_VOTELIST] = CreateMultiForward("mapm_prepare_votelist", ET_IGNORE, FP_CELL);
 	g_hForwards[VOTE_STARTED] = CreateMultiForward("mapm_vote_started", ET_IGNORE, FP_CELL);
@@ -253,7 +250,7 @@ load_maplist(const file[])
 		set_fail_state("Can't read maps file.");
 	}
 
-	new map_info[MapStruct], text[48], map[MAPNAME_LENGTH], min[3], max[3];
+	new map_info[MapStruct], text[48], map[MAPNAME_LENGTH], min[3], max[3], bool:nextmap;
 	new cur_map[MAPNAME_LENGTH]; get_mapname(cur_map, charsmax(cur_map));
 
 	while(!feof(f)) {
@@ -263,8 +260,13 @@ load_maplist(const file[])
 		if(!map[0] || map[0] == ';' || !valid_map(map) || get_map_index(map) != INVALID_MAP_INDEX) continue;
 
 		if(equali(map, cur_map)) {
+			nextmap = true;
 			continue;
 		}
+		if(nextmap) {
+			nextmap = false;
+			set_cvar_string("amx_nextmap", map);
+		}
 
 		map_info[MapName] = map;
 		map_info[MinPlayers] = str_to_num(min);
@@ -285,21 +287,6 @@ load_maplist(const file[])
 	ExecuteForward(g_hForwards[MAPLIST_LOADED], ret, g_aMapsList);
 }
 //-----------------------------------------------------//
-// Commands stuff
-//-----------------------------------------------------//
-public concmd_startvote(id, level, cid)
-{
-	if(!cmd_access(id, level, cid, 1)) {
-		return PLUGIN_HANDLED;
-	}
-
-	if(!prepare_vote(VOTE_BY_CMD)) {
-		// write vote already started
-	}
-
-	return PLUGIN_HANDLED;
-}
-//-----------------------------------------------------//
 // Vote stuff
 //-----------------------------------------------------//
 prepare_vote(type)
@@ -308,7 +295,7 @@ prepare_vote(type)
 		return 0;
 	}
 
-	server_print("--prepare vote--");
+	// server_print("--prepare vote--");
 
 	g_bVoteStarted = true;
 	g_bVoteFinished = false;
@@ -343,12 +330,12 @@ prepare_vote(type)
 		}
 	}
 
-	server_print("Votelist:");
+	/* server_print("Votelist:");
 	for(new i; i < g_iVoteItems; i++) {
 		if(g_sVoteList[i][0]) {
 			server_print("%d - %s", i + 1, g_sVoteList[i]);
 		}
-	}
+	} */
 
 	ExecuteForward(g_hForwards[CAN_BE_EXTENDED], ret, type);
 	g_bCanExtend = !ret;
@@ -447,7 +434,7 @@ public countdown(taskid)
 }
 start_vote()
 {
-	server_print("--start vote--");
+	// server_print("--start vote--");
 
 	new ret;
 	ExecuteForward(g_hForwards[VOTE_STARTED], ret, g_iVoteType);
@@ -532,7 +519,7 @@ finish_vote()
 	g_bVoteStarted = false;
 
 	// vote results
-	server_print("--finish vote--");
+	// server_print("--finish vote--");
 
 	// pre forward
 	new ret;

map_manager_online_sorter.sma

@@ -38,12 +38,12 @@ public mapm_prepare_votelist(type)
 	new Array:array = ArrayCreate(MAPNAME_LENGTH, 1);
 	new map_info[MapStruct], size = ArraySize(g_aMapsList);
 
-	server_print("Found maps for current online:");
+	// server_print("Found maps for current online:");
 	for(new i; i < size; i++) {
 		ArrayGetArray(g_aMapsList, i, map_info);
 		if(map_info[MinPlayers] <= players_num <= map_info[MaxPlayers]) {
 			ArrayPushString(array, map_info[MapName]);
-			server_print("%d - %s", ArraySize(array), map_info[MapName]);
+			// server_print("%d - %s", ArraySize(array), map_info[MapName]);
 		}
 	}
 

map_manager_scheduler.sma

@@ -1,4 +1,5 @@
 #include <amxmodx>
+#include <amxmisc>
 #include <map_manager>
 
 #if AMXX_VERSION_NUM < 183
@@ -88,6 +89,9 @@ public plugin_init()
 
 	g_pCvars[NEXTMAP] = register_cvar("amx_nextmap", "", FCVAR_SERVER|FCVAR_EXTDLL|FCVAR_SPONLY);
 
+	register_concmd("mapm_start_vote", "concmd_startvote", ADMIN_MAP);
+	register_concmd("mapm_stop_vote", "concmd_stopvote", ADMIN_MAP);
+
 	register_event("TeamScore", "event_teamscore", "a");
 	register_event("HLTV", "event_newround", "a", "1=0", "2=0");
 	// register_event("TextMsg", "event_restart", "a", "2=#Game_Commencing", "2=#Game_will_restart_in");
@@ -143,6 +147,36 @@ restore_limits()
 		g_iExtendedNum = 0;
 	}
 }
+public concmd_startvote(id, level, cid)
+{
+	if(!cmd_access(id, level, cid, 1)) {
+		return PLUGIN_HANDLED;
+	}
+
+	// TODO: add logging
+	planning_vote(VOTE_BY_CMD);
+
+	return PLUGIN_HANDLED;
+}
+public concmd_stopvote(id, level, cid)
+{
+	if(!cmd_access(id, level, cid, 1)) {
+		return PLUGIN_HANDLED;
+	}
+
+	// TODO: add logging
+	mapm_stop_vote();
+
+	if(g_bVoteInNewRound) {
+		g_bVoteInNewRound = false;
+
+		if(g_fOldTimeLimit > 0.0) {
+			set_float(TIMELIMIT, g_fOldTimeLimit);
+		}
+	}
+
+	return PLUGIN_HANDLED;
+}
 public task_checktime()
 {
 	if(is_vote_started() || is_vote_finished() || get_float(TIMELIMIT) <= 0.0) {