1.1 --- a/plugins/include/menus.inc	Wed Aug 08 02:30:03 2007 +0000
     1.2 +++ b/plugins/include/menus.inc	Wed Aug 08 02:44:36 2007 +0000
     1.3 @@ -38,7 +38,8 @@
     1.4  	MenuAction_Select = (1<<2),		/**< An item was selected (param1=client, param2=item) */
     1.5  	MenuAction_Cancel = (1<<3),		/**< The menu was cancelled (param1=client, param2=reason) */
     1.6  	MenuAction_End = (1<<4),		/**< A menu display has fully ended (param1=reason, param2=cancel reason) */
     1.7 -	MenuAction_VoteEnd = (1<<5),	/**< (VOTE ONLY): A vote sequence has succeeded (param1=chosen item) */
     1.8 +	MenuAction_VoteEnd = (1<<5),	/**< (VOTE ONLY): A vote sequence has succeeded (param1=chosen item) 
     1.9 +										 This is not called if SetVoteResultCallback has been used on the menu. */
    1.10  	MenuAction_VoteStart = (1<<6), 	/**< (VOTE ONLY): A vote sequence has started (nothing passed) */
    1.11  	MenuAction_VoteCancel = (1<<7),	/**< (VOTE ONLY): A vote sequence has been cancelled (nothing passed) */
    1.12  	MenuAction_DrawItem = (1<<8),	/**< An item is being drawn; return the new style (param1=client, param2=item) */
    1.13 @@ -97,6 +98,7 @@
    1.14  	MenuEnd_Cancelled = -3,			/**< Menu was cancelled (reason in param2) */
    1.15  	MenuEnd_Exit = -4,				/**< Menu was cleanly exited via "exit" */
    1.16  	MenuEnd_ExitBack = -5,			/**< Menu was cleanly exited via "back" */
    1.17 +	MenuEnd_NoVotes = -6,			/**< A menu received no votes */
    1.18  };
    1.19  
    1.20  /**
    1.21 @@ -418,6 +420,7 @@
    1.22  /**
    1.23   * Callback for when a vote has ended and results are available.
    1.24   *
    1.25 + * @param menu				The menu being voted on.
    1.26   * @param num_votes			Number of votes tallied in total.
    1.27   * @param num_clients		Number of clients who could vote.
    1.28   * @param client_info		Array of clients.  Use VOTEINFO_CLIENT_ defines.
    1.29 @@ -426,7 +429,8 @@
    1.30   *							defines.
    1.31   * @noreturn
    1.32   */
    1.33 -functag VoteHandler public(num_votes, 
    1.34 +functag VoteHandler public(Handle:menu,
    1.35 +						   num_votes, 
    1.36  						   num_clients,
    1.37  						   const client_info[][2], 
    1.38  						   num_items,