1.1 --- a/plugins/include/menus.inc	Thu Aug 09 23:34:53 2007 +0000
     1.2 +++ b/plugins/include/menus.inc	Thu Aug 09 23:45:33 2007 +0000
     1.3 @@ -41,7 +41,7 @@
     1.4  	MenuAction_VoteEnd = (1<<5),	/**< (VOTE ONLY): A vote sequence has succeeded (param1=chosen item) 
     1.5  										 This is not called if SetVoteResultCallback has been used on the menu. */
     1.6  	MenuAction_VoteStart = (1<<6), 	/**< (VOTE ONLY): A vote sequence has started (nothing passed) */
     1.7 -	MenuAction_VoteCancel = (1<<7),	/**< (VOTE ONLY): A vote sequence has been cancelled (nothing passed) */
     1.8 +	MenuAction_VoteCancel = (1<<7),	/**< (VOTE ONLY): A vote sequence has been cancelled (param1=reason) */
     1.9  	MenuAction_DrawItem = (1<<8),	/**< An item is being drawn; return the new style (param1=client, param2=item) */
    1.10  	MenuAction_DisplayItem = (1<<9) /**< Item text is being drawn to the display (param1=client, param2=item)
    1.11  										  To change the text, use RedrawMenuItem().
    1.12 @@ -75,7 +75,7 @@
    1.13  #define VOTEINFO_ITEM_VOTES			1		/**< Number of votes for the item */
    1.14  
    1.15  /**
    1.16 - * Reasons a menu can be cancelled.
    1.17 + * Reasons a menu can be cancelled (MenuAction_Cancel).
    1.18   */
    1.19  enum
    1.20  {
    1.21 @@ -88,7 +88,16 @@
    1.22  };
    1.23  
    1.24  /**
    1.25 - * Reasons a menu ended.
    1.26 + * Reasons a vote can be cancelled (MenuAction_VoteCancel).
    1.27 + */
    1.28 +enum
    1.29 +{
    1.30 +	VoteCancel_Generic = -1,		/**< Vote was generically cancelled. */
    1.31 +	VoteCancel_NoVotes = -2,		/**< Vote did not receive any votes. */
    1.32 +};
    1.33 +
    1.34 +/**
    1.35 + * Reasons a menu ended (MenuAction_End).
    1.36   */
    1.37  enum
    1.38  {
    1.39 @@ -98,7 +107,6 @@
    1.40  	MenuEnd_Cancelled = -3,			/**< Menu was cancelled (reason in param2) */
    1.41  	MenuEnd_Exit = -4,				/**< Menu was cleanly exited via "exit" */
    1.42  	MenuEnd_ExitBack = -5,			/**< Menu was cleanly exited via "back" */
    1.43 -	MenuEnd_NoVotes = -6,			/**< A menu received no votes */
    1.44  };
    1.45  
    1.46  /**