Merge pull request #23 from ashleyhuxley/menu_rename

Update references from menu to player_select

bomber.c

@@ -181,9 +181,9 @@ int32_t bomber_main(void* p)
         return 1;
     }
 
-    bomber_app_set_mode(state, BomberAppMode_Menu);
+    bomber_app_set_mode(state, BomberAppMode_PlayerSelect);
 
-    // TODO: This should be moved to after the menu
+    // TODO: This should be moved to after the Player Select menu
     state->level = level1;
     uint8_t wall_count = count_walls(state->level);
     uint8_t powerup_bomb_count = (uint8_t)round((POWERUP_EXTRABOMB_RATIO * wall_count));

bomber_loop.c

@@ -110,7 +110,7 @@ static bool handle_game_direction(BomberAppState* state, InputEvent input) {
 // state: Pointer to the application state
 // input: Represents the input event
 // returns: true if the viewport should be updated, else false
-static bool handle_menu_input(BomberAppState* state, InputEvent input) {
+static bool handle_player_select_input(BomberAppState* state, InputEvent input) {
     if(input.type == InputTypeShort) {
         switch(input.key) {
         case InputKeyUp:
@@ -189,8 +189,8 @@ static bool bomber_app_handle_input(BomberAppState* state, InputEvent input) {
     switch(state->mode) {
     case BomberAppMode_Playing:
         return handle_game_input(state, input);
-    case BomberAppMode_Menu:
-        return handle_menu_input(state, input);
+    case BomberAppMode_PlayerSelect:
+        return handle_player_select_input(state, input);
     default:
         break;
     }

bomber_ui.c

@@ -68,8 +68,8 @@ static void render_game(Canvas* canvas, BomberAppState* state) {
     }
 }
 
-// Renders the menu to the viewport - called while in the menu
-static void render_menu(Canvas* canvas, BomberAppState* state) {
+// Renders the player select menu to the viewport - called while in the player select menu
+static void render_player_select(Canvas* canvas, BomberAppState* state) {
     uint8_t ax = state->isPlayerTwo ? 70 : 20;
 
     canvas_set_font(canvas, FontSecondary);
@@ -108,8 +108,8 @@ void bomber_ui_render_callback(Canvas* canvas, void* context) {
     case BomberAppMode_Playing:
         render_game(canvas, state);
         break;
-    case BomberAppMode_Menu:
-        render_menu(canvas, state);
+    case BomberAppMode_PlayerSelect:
+        render_player_select(canvas, state);
         break;
     case BomberAppMode_GameOver:
         render_game_over(canvas, state);

types.h

@@ -91,7 +91,7 @@ typedef struct {
 // Application mode. Rendering and input handlers rely on this to know what to render, or how to handle input.
 typedef enum {
     BomberAppMode_Uninitialised,
-    BomberAppMode_Menu,
+    BomberAppMode_PlayerSelect,
     BomberAppMode_Ready,
     BomberAppMode_Playing,
     BomberAppMode_Finished,