Merge pull request #406 from alliedmodders/findmap17

Change FindMap to take a const char* for searching instead of char* (r=Drifter).

core/smn_halflife.cpp

@@ -71,10 +71,23 @@ static cell_t FindMap(IPluginContext *pContext, const cell_t *params)
 {
 	char *pMapname;
 	pContext->LocalToString(params[1], &pMapname);
-
-	cell_t size = params[2];
-
-	return static_cast<cell_t>(g_HL2.FindMap(pMapname, size));
+
+	cell_t len;
+	if (params[0] > 2)
+	{
+		len = params[3];
+
+		char *pDestMap;
+		pContext->LocalToString(params[2], &pDestMap);
+		strncpy(pDestMap, pMapname, len);
+		pMapname = pDestMap;
+	}
+	else
+	{
+		len = params[2];
+	}
+
+	return static_cast<cell_t>(g_HL2.FindMap(pMapname, len));
 }
 
 static cell_t IsDedicatedServer(IPluginContext *pContext, const cell_t *params)

plugins/include/halflife.inc

@@ -158,12 +158,13 @@ native bool:IsMapValid(const String:map[]);
  * Returns whether a full or partial map name is found or can be resolved
  * 
  * @param map 			Map name (usually same as map path relative to maps/ dir,
- *						excluding .bsp extension). If result is FindMap_FuzzyMatch
- *						or FindMap_NonCanonical, this will be updated to the full path.
+ *						excluding .bsp extension).
+ * @param foundmap		Resolved map name. If the return is FindMap_FuzzyMatch
+ *						or FindMap_NonCanonical the buffer will be the full path.
  * @param maxlen		Maximum length to write to map var.
  * @return				Result of the find operation. Not all result types are supported on all games.
  */
-native FindMapResult FindMap(char[] map, int maxlen);
+native FindMapResult FindMap(const char[] map, char[] foundmap, int maxlen);
 
 /**
  * Returns whether the server is dedicated.