Merge branch 'master' of https://github.com/alliedmodders/sourcemod into mapchooser-updates

plugins/include/menus.inc

@@ -810,14 +810,28 @@ stock bool VoteMenuToAll(Handle menu, int time, int flags=0)
  * @param item_info			Array of items, sorted by count.  Use VOTEINFO_ITEM
  *							defines.
  */
-typedef VoteHandler = function void (
-  Menu menu,
-  int num_votes, 
-  int num_clients,
-  const int client_info[][2], 
-  int num_items,
-  const int item_info[][2]
-);
+typeset VoteHandler
+{
+	// old style
+	function void(
+		Menu menu,
+		int num_votes,
+		int num_clients,
+		const int client_info[][2],
+		int num_items,
+		const int item_info[][2]
+	);
+
+	// new style
+	function void(
+		Menu menu,
+		int num_votes,
+		int num_clients,
+		const int[][] client_info,
+		int num_items,
+		const int[][] item_info
+	);
+};
 
 /**
  * Sets an advanced vote handling callback.  If this callback is set,

plugins/include/version.inc

@@ -42,8 +42,8 @@
 #define SOURCEMOD_V_REV			0
 #define SOURCEMOD_V_CSET		"0"
 #define SOURCEMOD_V_MAJOR		1				/**< SourceMod Major version */
-#define SOURCEMOD_V_MINOR		7				/**< SourceMod Minor version */
+#define SOURCEMOD_V_MINOR		8				/**< SourceMod Minor version */
 #define SOURCEMOD_V_RELEASE		0				/**< SourceMod Release version */
 
-#define SOURCEMOD_VERSION	"1.7.0-manual"	/**< SourceMod version string (major.minor.release-tag) */
+#define SOURCEMOD_VERSION	"1.8.0-manual"	/**< SourceMod version string (major.minor.release-tag) */
 #endif