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.

2010-11-07 02:08:17 +00:00
parent b0c61049da
commit 3c19533a4c
13 changed files with 303 additions and 274 deletions
@@ -417,7 +417,7 @@ void GameStateShop::Update(float dt)
      if (options[Options::CHEATMODE].number)
        menu->Add(-2,"Steal 1,000 credits");
      menu->Add(12,"Save & Back to Main Menu");
-      menu->Add(13, "Cancel");
+      menu->Add(kCancelMenuID, "Cancel");
    }
    break;
    case STAGE_SHOP_TASKS:
@@ -437,7 +437,7 @@ void GameStateShop::Update(float dt)
              menu = NEW SimpleMenu(11,this,Fonts::MENU_FONT,SCREEN_WIDTH/2-100,20);
              menu->Add(15,"Return to shop");
              menu->Add(12,"Save & Back to Main Menu");
-              menu->Add(13, "Cancel");
+              menu->Add(kCancelMenuID, "Cancel");
            }
          }
        }