New native added mm_force_change_map

addons/amxmodx/scripting/include/mm_incs/defines.inc

@@ -6,8 +6,8 @@
 #define PLUGIN_NAME                     "MultiMod Manager"
 
 #define MM_VERSION_MAJOR                1
-#define MM_VERSION_MINOR                1
-#define MM_VERSION_PATCH                1
+#define MM_VERSION_MINOR                2
+#define MM_VERSION_PATCH                0
 
 #define PLUGIN_VERSION                  fmt("v%d.%d.%d", MM_VERSION_MAJOR, MM_VERSION_MINOR, MM_VERSION_PATCH)
 
@@ -65,7 +65,8 @@ enum
 	TASK_RTV,
 	TASK_SHOWTIME,
 	TASK_ENDMAP,
-	TASK_VOTE_ADMIN
+	TASK_VOTE_ADMIN,
+	TASK_FORCE_CHANGE_MAP,
 };
 
 const KEYSMENU = (1<<0) | (1<<1) | (1<<2) | (1<<3) | (1<<4) | (1<<5) | (1<<6) | (1<<7) | (1<<8) | (1<<9);

addons/amxmodx/scripting/include/mm_incs/natives.inc

@@ -164,4 +164,57 @@ public bool:_mm_force_votemod(plugin_id, argc)
 	}
 
 	return false;
+}
+
+/**
+ * Force a map change.
+ *
+ * @param iModId        Mod index.
+ * @param szMap         Map to change to.
+ * @param flChangeTime  Time to wait before changing map.
+ *                      0.0 to change map immediately.
+ *
+ * @return (bool)       true on success, false otherwise.
+ *
+ * native bool:mm_force_change_map(const iModId, const sMap[], const Float:flChangeTime = 0.0);
+ */
+public _mm_force_change_map(plugin_id, argc)
+{
+	enum _:args_e { arg_modid = 1, arg_map, arg_changetime };
+
+	if(argc != (args_e-1))
+	{
+		abort(AMX_ERR_NATIVE, "'mm_force_change_map' needs %d param(s) (count: %d)", (args_e-1), argc);
+		return false;
+	}
+
+	new iModId = get_param(arg_modid);
+
+	if(iModId < 0 || iModId >= ArraySize(g_GlobalConfigs[Mods]))
+	{
+		abort(AMX_ERR_NATIVE, "Invalid array size (%d)", iModId);
+		return false;
+	}
+
+	new szMap[MAX_MAPNAME_LENGTH];
+	get_string(arg_map, szMap, charsmax(szMap));
+
+	if(!IsValidMap(szMap) || !IsValidMapForMod(iModId, szMap))
+	{
+		abort(AMX_ERR_NATIVE, "Invalid map name (%s)", szMap);
+		return false;
+	}
+
+	new Float:flChangeTime = floatmax(0.0, get_param_f(arg_changetime));
+
+	if(flChangeTime)
+	{
+		remove_task(TASK_FORCE_CHANGE_MAP);
+		set_task(flChangeTime, "OnTask_ForceChangeMap", TASK_FORCE_CHANGE_MAP);
+
+		return true;
+	}
+
+	OnCSGameRules_GoToIntermission();
+	return true;
 }

addons/amxmodx/scripting/include/multimod_manager_natives.inc

@@ -8,8 +8,8 @@
  * Do not modify this!
  */
 #define MM_VERSION_MAJOR 1
-#define MM_VERSION_MINOR 1
-#define MM_VERSION_PATCH 1
+#define MM_VERSION_MINOR 2
+#define MM_VERSION_PATCH 0
 
 /* ===========================================================================
 *                 [ MULTIMOD MANAGER NATIVES ]
@@ -81,6 +81,18 @@ native mm_get_nextmod_name(szOutput[], const iLen);
  */
 native bool:mm_force_votemod();
 
+/**
+ * Force a map change.
+ *
+ * @param iModId        Mod index.
+ * @param szMap         Map to change to.
+ * @param flChangeTime  Time to wait before changing map.
+ *                      0.0 to change map immediately.
+ *
+ * @return (bool)       true on success, false otherwise.
+ */
+native bool:mm_force_change_map(const iModId, const sMap[], const Float:flChangeTime = 0.0);
+
 /* ===========================================================================
 *                 [ MULTIMOD MANAGER FORWARDS ]
 * ============================================================================ */

addons/amxmodx/scripting/multimod_manager.sma

@@ -24,6 +24,7 @@ public plugin_natives()
 	register_native("mm_get_nextmod_id", "_mm_get_nextmod_id");
 	register_native("mm_get_nextmod_name", "_mm_get_nextmod_name");
 	register_native("mm_force_votemod", "_mm_force_votemod");
+	register_native("mm_force_change_map", "_mm_force_change_map");
 }
 
 public plugin_precache()
@@ -310,7 +311,7 @@ MultiMod_Init()
 		return;
 	}
 
-	if(bReloadMod || !IsValidMapForMod(g_iCurrentMod))
+	if(bReloadMod || !IsValidMapForMod(g_iCurrentMod, g_szCurrentMap))
 	{
 		g_iNextSelectMod = bReloadMod ? 0 : g_iCurrentMod; // 0 = First mod as default
 		MultiMod_SetNextMod(g_iNextSelectMod); 
@@ -850,7 +851,7 @@ MultiMod_SetGameDescription(const iMod)
 	return 0;
 }
 
-bool:IsValidMapForMod(const iModId)
+bool:IsValidMapForMod(const iModId, const szMapName[MAX_MAPNAME_LENGTH])
 {
 	if(iModId < 0 || iModId > ArraySize(g_GlobalConfigs[Mods]))
 		return false;
@@ -863,7 +864,7 @@ bool:IsValidMapForMod(const iModId)
 	{
 		ArrayGetString(aMod[Maps], i, szMap, charsmax(szMap));
 
-		if(equali(g_szCurrentMap, szMap))
+		if(equali(szMapName, szMap))
 			return true;
 	}
 
@@ -914,4 +915,9 @@ GetRandomMapForMod(const iModId, szMap[], const iLen)
 	}
 
 	return 0;
+}
+
+public OnTask_ForceChangeMap()
+{
+	OnCSGameRules_GoToIntermission();
 }