Added the notion of a 'cancel' button, and unified all the 'cancel' menu IDs to be kCancelMenuID (ie -1). I've slaved the Menu button (ie Esc on win, 'Start' button on PSP) to this - the idea being, if you hit the Menu button to bring up a menu, hitting it again will dismiss it without doing anything, which is pretty standard behavior for most console/computer games.

projects/mtg/include/GameStateDeckViewer.h

@@ -53,12 +53,12 @@ enum DECK_VIEWER_MENU_ITEMS
   {
     MENU_ITEM_NEW_DECK = -30,
     MENU_ITEM_CHEAT_MODE = -12,
-    MENU_ITEM_CANCEL = -1,
+    MENU_ITEM_CANCEL = kCancelMenuID,
     MENU_ITEM_SAVE_RETURN_MAIN_MENU = 0,
     MENU_ITEM_SAVE_RENAME = 1,
     MENU_ITEM_SWITCH_DECKS_NO_SAVE = 2,
     MENU_ITEM_MAIN_MENU = 3,
-    MENU_ITEM_EDITOR_CANCEL = 4,
+    MENU_ITEM_EDITOR_CANCEL = kCancelMenuID,
     MENU_ITEM_SAVE_AS_AI_DECK = 5,
     MENU_ITEM_YES = 20,
     MENU_ITEM_NO = 21,

projects/mtg/include/GameStateDuel.h

@@ -57,8 +57,8 @@ class GameStateDuel: public GameState, public JGuiListener
   
   enum ENUM_DUEL_STATE_MENU_ITEM
   {
-    MENUITEM_NEW_DECK = -1,
-    MENUITEM_CANCEL = -10,
+    MENUITEM_CANCEL = kCancelMenuID,
+    MENUITEM_NEW_DECK = -10,
     MENUITEM_RANDOM_PLAYER = -11,
     MENUITEM_RANDOM_AI = -12,
     MENUITEM_MAIN_MENU = -13,