Subversion Repositories eduke32

Rev

Rev 8500 | Rev 8536 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 8500 Rev 8501
Line 1518... Line 1518...
1518
// MUST be in ascending order of MenuID enum values due to binary search
1518
// MUST be in ascending order of MenuID enum values due to binary search
1519
static Menu_t Menus[] = {
1519
static Menu_t Menus[] = {
1520
    { &M_MAIN, MENU_MAIN, MENU_CLOSE, MA_None, Menu },
1520
    { &M_MAIN, MENU_MAIN, MENU_CLOSE, MA_None, Menu },
1521
    { &M_MAIN_INGAME, MENU_MAIN_INGAME, MENU_CLOSE, MA_None, Menu },
1521
    { &M_MAIN_INGAME, MENU_MAIN_INGAME, MENU_CLOSE, MA_None, Menu },
1522
    { &M_EPISODE, MENU_EPISODE, MENU_MAIN, MA_Return, Menu },
1522
    { &M_EPISODE, MENU_EPISODE, MENU_MAIN, MA_Return, Menu },
1523
    { &M_USERMAP, MENU_USERMAP, MENU_PREVIOUS, MA_Return, FileSelect },
1523
    { &M_USERMAP, MENU_USERMAP, MENU_EPISODE, MA_Return, FileSelect },
1524
    { &M_NEWGAMECUSTOM, MENU_NEWGAMECUSTOM, MENU_MAIN, MA_Return, Menu },
1524
    { &M_NEWGAMECUSTOM, MENU_NEWGAMECUSTOM, MENU_MAIN, MA_Return, Menu },
1525
    { &M_NEWGAMECUSTOMSUB, MENU_NEWGAMECUSTOMSUB, MENU_NEWGAMECUSTOM, MA_Return, Menu },
1525
    { &M_NEWGAMECUSTOMSUB, MENU_NEWGAMECUSTOMSUB, MENU_NEWGAMECUSTOM, MA_Return, Menu },
1526
    { &M_SKILL, MENU_SKILL, MENU_PREVIOUS, MA_Return, Menu },
1526
    { &M_SKILL, MENU_SKILL, MENU_PREVIOUS, MA_Return, Menu },
1527
#ifndef EDUKE32_SIMPLE_MENU
1527
#ifndef EDUKE32_SIMPLE_MENU
1528
    { &M_GAMESETUP, MENU_GAMESETUP, MENU_OPTIONS, MA_Return, Menu },
1528
    { &M_GAMESETUP, MENU_GAMESETUP, MENU_OPTIONS, MA_Return, Menu },
Line 4452... Line 4452...
4452
    }
4452
    }
4453
}
4453
}
4454
4454
4455
static void Menu_ChangingTo(Menu_t * m)
4455
static void Menu_ChangingTo(Menu_t * m)
4456
{
4456
{
-
 
4457
    switch (m->menuID)
-
 
4458
    {
-
 
4459
    case MENU_USERMAP:
-
 
4460
        // terrible hack
-
 
4461
        if (g_previousMenu != MENU_SKILL && g_previousMenu != MENU_USERMAP)
-
 
4462
            m->parentID = g_previousMenu;
-
 
4463
        break;
-
 
4464
    }
-
 
4465
4457
#ifdef __ANDROID__
4466
#ifdef __ANDROID__
4458
    if (m->menuID == MENU_TOUCHBUTTONS)
4467
    if (m->menuID == MENU_TOUCHBUTTONS)
4459
        AndroidToggleButtonEditor();
4468
        AndroidToggleButtonEditor();
4460
#endif
4469
#endif
4461
4470