core: fix nextmap detection

update include description
added load config

Author: Mistrick

include/map_manager.inc

@@ -16,135 +16,183 @@
 #include <map_manager_stocks>
 
 /**
- * TODO: write this.
- * 
- * @return Map index
+ * Get map index in mapslist array.
+ *
+ * @param map			Map name
+ *
+ * @return				Map index or INVALID_MAP_INDEX if map not exist in mapslist
  */
 native mapm_get_map_index(map[]);
 
 /**
- * TODO: write this.
+ * Get prefix const from core.
  * 
+ * @param prefix		Prefix string
+ * @param len			String lenght
+ *
  * @noreturn
  */
 native mapm_get_prefix(prefix[], len);
 
 /**
- * TODO: write this.
+ * Start vote.
  * 
+ * @param type			Vote type, use const VOTE_BY_*
+ *
  * @noreturn
  */
 native mapm_start_vote(type);
 
 /**
- * TODO: write this.
+ * Stop vote.
  * 
  * @noreturn
  */
 native mapm_stop_vote();
 
 /**
- * TODO: write this.
+ * Get votelist size const from core.
  * 
  * @return Votelist size
  */
 native mapm_get_votelist_size();
 
 /**
- * TODO: write this.
+ * Set max items in vote.
+ *
+ * @param value			Amount items in vote
  * 
  * @noreturn
  */
 native mapm_set_votelist_max_items(value);
 
 /**
- * TODO: write this.
+ * Push map in votelist.
+ *
+ * @note Use native in forward mapm_prepare_votelist().
+ *
+ * @param map			Map name
+ * @param type			Type for addons
+ * @param ignore_check	Allow ignore some checks, bit sum, use const CHECK_*
  * 
- * @noreturn
+ * @return				Result of pushing, const PUSH_*
  */
 native mapm_push_map_to_votelist(map[], type = PUSH_BY_NATIVE, ignore_check = CHECK_NOT_IGNORED);
 
 /**
- * TODO: write this.
- * Use in mapm_analysis_of_results()
+ * Get amount maps in votelist.
+ *
+ * @note Use in mapm_analysis_of_results()
  * 
  * @noreturn
  */
 native mapm_get_count_maps_in_vote();
 
 /**
- * TODO: write this.
- * Use in mapm_analysis_of_results()
+ * Get info about votelist item.
+ *
+ * @note Use in mapm_analysis_of_results()
+ *
+ * @param item			Index in votelist
+ * @param map			Map name
+ * @param len			Map name string lenght
  * 
- * @return Votes
+ * @return				Votes
  */
 native mapm_get_voteitem_info(item, map[], len);
 
 /**
- * TODO: write this.
+ * Returns if vote started.
  * 
- * @return true/false
+ * @return				true/false
  */
 native bool:is_vote_started();
 
 /**
- * TODO: write this.
+ * Returns if vote finished.
  * 
- * @return true/false
+ * @return				true/false
  */
 native bool:is_vote_finished();
 
 /**
- * TODO: write this.
+ * Called after load maps from file.
  * 
+ * @param maplist		Array with loaded maps
+ *
  * @noreturn
  */
 forward mapm_maplist_loaded(Array:maplist);
 
 /**
- * TODO: write this.
+ * Called every second before vote or in vote.
+ *
+ * @param type			Type of countdown, used const COUNTDOWN_*
+ * @param time			Current second of countdown
  * 
  * @noreturn
  */
 forward mapm_countdown(type, time);
 
 /**
- * TODO: write this.
+ * Called before vote.
+ *
+ * @param type			Type of vote, used const VOTE_BY_*
  * 
  * @noreturn
  */
 forward mapm_prepare_votelist(type);
 
 /**
- * TODO: write this.
+ * Called when core or addons are trying add map in votelist.
+ *
+ * @param map			Map name
+ * @param type			Type of vote, used const VOTE_BY_*
+ * @param index			Index in mapslist array
  * 
- * @noreturn
+ * @return				MAP_ALLOWED
+ *						MAP_BLOCKED	
  */
 forward mapm_can_be_in_votelist(map[], type, index);
 
 /**
- * TODO: write this.
- * 
- * @noreturn
+ * Called for permission to extend current map.
+ *
+ * @param type			Type of vote, used const VOTE_BY_*
+ *
+ * @return				EXTEND_ALLOWED to allow extend current map
+ *						EXTEND_BLOCKED to block extend current map
  */
 forward mapm_can_be_extended(type);
 
 /**
- * TODO: write this.
+ * Called when core start show menu with vote.
+ *
+ * @param type			Type of vote, used const VOTE_BY_*
  * 
  * @noreturn
  */
 forward mapm_vote_started(type);
 
 /**
- * TODO: write this.
+ * Called before vote finish.
+ *
+ * @param type			Type of vote, used const VOTE_BY_*
+ * @param total_votes	Type of vote, used const VOTE_BY_*
  * 
- * @noreturn
+ * @return				ALLOW_VOTE to allow finish vote
+ *						ABORT_VOTE to block finish vote, forward mapm_vote_finished() will not be called
  */
 forward mapm_analysis_of_results(type, total_votes);
 
 /**
- * TODO: write this.
+ * Called when vote finished.
+ *
+ * @note Can be blocked in forward mapm_analysis_of_results()
+ *
+ * @param map			Type of vote, used const VOTE_BY_*
+ * @param type			Type of vote, used const VOTE_BY_*
+ * @param total_votes	Type of vote, used const VOTE_BY_*
  * 
  * @noreturn
  */

include/map_manager_consts.inc

@@ -52,6 +52,11 @@ enum {
 	ABORT_VOTE
 };
 
+enum {
+	EXTEND_MINUTES,
+	EXTEND_ROUNDS
+};
+
 enum {
 	EXTEND_ALLOWED,
 	EXTEND_BLOCKED

map_manager_core.sma

@@ -1,9 +1,3 @@
-/*
-	Core functions:
-	- load maplist
-	- start vote by time ? or do with addon
-	- start/stop vote
-*/
 #include <amxmodx>
 #include <map_manager_consts>
 #include <map_manager_stocks>
@@ -232,6 +226,9 @@ public plugin_cfg()
 {
 	g_aMapsList = ArrayCreate(MapStruct, 1);
 
+	new configsdir[256]; get_localinfo("amxx_configsdir", configsdir, charsmax(configsdir));
+	server_cmd("exec %s/map_manager.cfg", configsdir);
+
 	// add forward for change file?
 	load_maplist(FILE_MAPS);
 }
@@ -250,7 +247,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], bool:nextmap;
+	new map_info[MapStruct], text[48], map[MAPNAME_LENGTH], first_map[MAPNAME_LENGTH], min[3], max[3], bool:nextmap, bool:found_nextmap;
 	new cur_map[MAPNAME_LENGTH]; get_mapname(cur_map, charsmax(cur_map));
 
 	while(!feof(f)) {
@@ -259,12 +256,16 @@ load_maplist(const file[])
 
 		if(!map[0] || map[0] == ';' || !valid_map(map) || get_map_index(map) != INVALID_MAP_INDEX) continue;
 
+		if(!first_map[0]) {
+			copy(first_map, charsmax(first_map), map);
+		}
 		if(equali(map, cur_map)) {
 			nextmap = true;
 			continue;
 		}
 		if(nextmap) {
 			nextmap = false;
+			found_nextmap = true;
 			set_cvar_string("amx_nextmap", map);
 		}
 
@@ -283,6 +284,10 @@ load_maplist(const file[])
 		set_fail_state(error);
 	}
 
+	if(!found_nextmap) {
+		set_cvar_string("amx_nextmap", first_map);
+	}
+
 	new ret;
 	ExecuteForward(g_hForwards[MAPLIST_LOADED], ret, g_aMapsList);
 }