Subversion Repositories eduke32

Rev

Rev 5004 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 5004 Rev 5023
Line 367... Line 367...
367
#if defined STARTUP_SETUP_WINDOW && !defined DROIDMENU
367
#if defined STARTUP_SETUP_WINDOW && !defined DROIDMENU
368
    &ME_GAMESETUP_STARTWIN,
368
    &ME_GAMESETUP_STARTWIN,
369
#endif
369
#endif
370
    &ME_GAMESETUP_AIM_AUTO,
370
    &ME_GAMESETUP_AIM_AUTO,
371
    &ME_GAMESETUP_WEAPSWITCH_PICKUP,
371
    &ME_GAMESETUP_WEAPSWITCH_PICKUP,
-
 
372
#ifdef DROIDMENU
372
    &ME_GAMESETUP_QUICKSWITCH,
373
    &ME_GAMESETUP_QUICKSWITCH,
373
    &ME_GAMESETUP_CROUCHLOCK,
374
    &ME_GAMESETUP_CROUCHLOCK,
374
#ifndef DROIDMENU
375
#else
375
    &ME_GAMESETUP_DEMOREC,
376
    &ME_GAMESETUP_DEMOREC,
376
#ifdef _WIN32
377
#ifdef _WIN32
377
    &ME_GAMESETUP_UPDATES,
378
    &ME_GAMESETUP_UPDATES,
378
#endif
379
#endif
379
#endif
380
#endif
Line 706... Line 707...
706
    &ME_MOUSESETUP_SMOOTH,
707
    &ME_MOUSESETUP_SMOOTH,
707
    &ME_MOUSESETUP_ADVANCED,
708
    &ME_MOUSESETUP_ADVANCED,
708
};
709
};
709
710
710
#ifdef DROIDMENU
711
#ifdef DROIDMENU
711
static MenuRangeFloat_t MEO_TOUCHSETUP_SENSITIVITY_MOVE = MAKE_MENURANGE(&droidinput.forward_sens, &MF_Redfont, 1.f, 10.f, 0.f, 20, 1 + EnforceIntervals);
712
static MenuRangeFloat_t MEO_TOUCHSETUP_SENSITIVITY_MOVE = MAKE_MENURANGE(&droidinput.forward_sens, &MF_Redfont, 1.f, 9.f, 0.f, 17, 1 + EnforceIntervals);
712
static MenuEntry_t ME_TOUCHSETUP_SENSITIVITY_MOVE = MAKE_MENUENTRY("Run sens:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_TOUCHSETUP_SENSITIVITY_MOVE, RangeFloat);
713
static MenuEntry_t ME_TOUCHSETUP_SENSITIVITY_MOVE = MAKE_MENUENTRY("Run sens:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_TOUCHSETUP_SENSITIVITY_MOVE, RangeFloat);
713
714
714
static MenuRangeFloat_t MEO_TOUCHSETUP_SENSITIVITY_STRAFE = MAKE_MENURANGE(&droidinput.strafe_sens, &MF_Redfont, 1.f, 10.f, 0.f, 20, 1 + EnforceIntervals);
715
static MenuRangeFloat_t MEO_TOUCHSETUP_SENSITIVITY_STRAFE = MAKE_MENURANGE(&droidinput.strafe_sens, &MF_Redfont, 1.f, 9.f, 0.f, 17, 1 + EnforceIntervals);
715
static MenuEntry_t ME_TOUCHSETUP_SENSITIVITY_STRAFE = MAKE_MENUENTRY("Strafe sens:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_TOUCHSETUP_SENSITIVITY_STRAFE, RangeFloat);
716
static MenuEntry_t ME_TOUCHSETUP_SENSITIVITY_STRAFE = MAKE_MENUENTRY("Strafe sens:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_TOUCHSETUP_SENSITIVITY_STRAFE, RangeFloat);
716
717
717
static MenuRangeFloat_t MEO_TOUCHSETUP_SENSITIVITY_LOOK = MAKE_MENURANGE(&droidinput.pitch_sens, &MF_Redfont, 1.f, 10.f, 0.f, 20, 1 + EnforceIntervals);
718
static MenuRangeFloat_t MEO_TOUCHSETUP_SENSITIVITY_LOOK = MAKE_MENURANGE(&droidinput.pitch_sens, &MF_Redfont, 1.f, 9.f, 0.f, 17, 1 + EnforceIntervals);
718
static MenuEntry_t ME_TOUCHSETUP_SENSITIVITY_LOOK = MAKE_MENUENTRY("Look sens:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_TOUCHSETUP_SENSITIVITY_LOOK, RangeFloat);
719
static MenuEntry_t ME_TOUCHSETUP_SENSITIVITY_LOOK = MAKE_MENUENTRY("Look sens:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_TOUCHSETUP_SENSITIVITY_LOOK, RangeFloat);
719
720
720
static MenuRangeFloat_t MEO_TOUCHSETUP_SENSITIVITY_TURN = MAKE_MENURANGE(&droidinput.yaw_sens, &MF_Redfont, 1.f, 10.f, 0.f, 20, 1 + EnforceIntervals);
721
static MenuRangeFloat_t MEO_TOUCHSETUP_SENSITIVITY_TURN = MAKE_MENURANGE(&droidinput.yaw_sens, &MF_Redfont, 1.f, 9.f, 0.f, 17, 1 + EnforceIntervals);
721
static MenuEntry_t ME_TOUCHSETUP_SENSITIVITY_TURN = MAKE_MENUENTRY("Turn sens:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_TOUCHSETUP_SENSITIVITY_TURN, RangeFloat);
722
static MenuEntry_t ME_TOUCHSETUP_SENSITIVITY_TURN = MAKE_MENUENTRY("Turn sens:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_TOUCHSETUP_SENSITIVITY_TURN, RangeFloat);
722
723
723
static MenuOption_t MEO_TOUCHSETUP_INVERT = MAKE_MENUOPTION(&MF_Redfont, &MEOS_NoYes, &droidinput.invertLook);
724
static MenuOption_t MEO_TOUCHSETUP_INVERT = MAKE_MENUOPTION(&MF_Redfont, &MEOS_NoYes, &droidinput.invertLook);
724
static MenuEntry_t ME_TOUCHSETUP_INVERT = MAKE_MENUENTRY("Invert look:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_TOUCHSETUP_INVERT, Option);
725
static MenuEntry_t ME_TOUCHSETUP_INVERT = MAKE_MENUENTRY("Invert look:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_TOUCHSETUP_INVERT, Option);
725
726
Line 1139... Line 1140...
1139
static const char* MenuCredits = "Credits";
1140
static const char* MenuCredits = "Credits";
1140
static MenuPanel_t M_CREDITS = { NoTitle, MENU_CREDITS5, MA_Return, MENU_CREDITS2, MA_Advance, };
1141
static MenuPanel_t M_CREDITS = { NoTitle, MENU_CREDITS5, MA_Return, MENU_CREDITS2, MA_Advance, };
1141
static MenuPanel_t M_CREDITS2 = { NoTitle, MENU_CREDITS, MA_Return, MENU_CREDITS3, MA_Advance, };
1142
static MenuPanel_t M_CREDITS2 = { NoTitle, MENU_CREDITS, MA_Return, MENU_CREDITS3, MA_Advance, };
1142
static MenuPanel_t M_CREDITS3 = { NoTitle, MENU_CREDITS2, MA_Return, MENU_CREDITS4, MA_Advance, };
1143
static MenuPanel_t M_CREDITS3 = { NoTitle, MENU_CREDITS2, MA_Return, MENU_CREDITS4, MA_Advance, };
1143
#ifdef DROIDMENU
1144
#ifdef DROIDMENU
1144
static MenuPanel_t M_CREDITS4 = { "Meltdown Collection", MENU_CREDITS3, MA_Return, MENU_CREDITS5, MA_Advance, };
1145
static MenuPanel_t M_CREDITS4 = { "Hail to the King", MENU_CREDITS3, MA_Return, MENU_CREDITS5, MA_Advance, };
1145
#else
1146
#else
1146
static MenuPanel_t M_CREDITS4 = { "About EDuke32", MENU_CREDITS3, MA_Return, MENU_CREDITS5, MA_Advance, };
1147
static MenuPanel_t M_CREDITS4 = { "About EDuke32", MENU_CREDITS3, MA_Return, MENU_CREDITS5, MA_Advance, };
1147
#endif
1148
#endif
1148
static MenuPanel_t M_CREDITS5 = { "About EDuke32", MENU_CREDITS4, MA_Return, MENU_CREDITS, MA_Advance, };
1149
static MenuPanel_t M_CREDITS5 = { "About EDuke32", MENU_CREDITS4, MA_Return, MENU_CREDITS, MA_Advance, };
1149
1150
Line 2106... Line 2107...
2106
2107
2107
        mgametextcenter(origin.x, origin.y + ((90-l)<<16), "Engine and game programming");
2108
        mgametextcenter(origin.x, origin.y + ((90-l)<<16), "Engine and game programming");
2108
        creditsminitext(origin.x + (160<<16), origin.y + ((90+10-l)<<16), "Philipp \"Helixhorned\" Kutin", 8);
2109
        creditsminitext(origin.x + (160<<16), origin.y + ((90+10-l)<<16), "Philipp \"Helixhorned\" Kutin", 8);
2109
        creditsminitext(origin.x + (160<<16), origin.y + ((90+7+10-l)<<16), "Evan \"Hendricks266\" Ramos", 8);
2110
        creditsminitext(origin.x + (160<<16), origin.y + ((90+7+10-l)<<16), "Evan \"Hendricks266\" Ramos", 8);
2110
2111
2111
#ifdef DROIDMENU
-
 
2112
# if defined EDUKE32_IOS
-
 
2113
        mgametextcenter(origin.x, origin.y + ((110+7-l)<<16), "iOS support programming");
-
 
2114
# else
-
 
2115
        mgametextcenter(origin.x, origin.y + ((110+7-l)<<16), "Android support programming");
-
 
2116
# endif
-
 
2117
        creditsminitext(origin.x + (160<<16), origin.y + ((110+7+10-l)<<16), "Emile Belanger", 8);
-
 
2118
#endif
-
 
2119
2112
2120
        mgametextcenter(origin.x, origin.y + ((130+7-l)<<16), "Based on \"JFDuke3D\" by");
2113
        mgametextcenter(origin.x, origin.y + ((130+7-l)<<16), "Based on \"JFDuke3D\" by");
2121
        creditsminitext(origin.x + (160<<16), origin.y + ((130+7+10-l)<<16), "Jonathon \"JonoF\" Fowler", 8);
2114
        creditsminitext(origin.x + (160<<16), origin.y + ((130+7+10-l)<<16), "Jonathon \"JonoF\" Fowler", 8);
2122
2115
2123
        mgametextcenter(origin.x, origin.y + ((150+7-l)<<16), "Uses BUILD Engine technology by");
2116
        mgametextcenter(origin.x, origin.y + ((150+7-l)<<16), "Uses BUILD Engine technology by");
Line 2147... Line 2140...
2147
                "Brandon Bergren",   // "Bdragon" - tiles.cfg
2140
                "Brandon Bergren",   // "Bdragon" - tiles.cfg
2148
                "Charlie Honig",     // "CONAN" - showview command
2141
                "Charlie Honig",     // "CONAN" - showview command
2149
                "Dan Gaskill",       // "DeeperThought" - testing
2142
                "Dan Gaskill",       // "DeeperThought" - testing
2150
                "David Koenig",      // "Bargle" - Merged a couple of things from duke3d_w32
2143
                "David Koenig",      // "Bargle" - Merged a couple of things from duke3d_w32
2151
                "Ed Coolidge",       // Mapster32 improvements
2144
                "Ed Coolidge",       // Mapster32 improvements
-
 
2145
                "Emile Belanger",    // original Android work
2152
                "Ferry Landzaat",    // ? (listed on the wiki page)
2146
                "Ferry Landzaat",    // ? (listed on the wiki page)
2153
                "Hunter_rus",        // tons of stuff
2147
                "Hunter_rus",        // tons of stuff
2154
                "James Bentler",     // Mapster32 improvements
2148
                "James Bentler",     // Mapster32 improvements
2155
                "Jasper Foreman",    // netcode contributions
2149
                "Jasper Foreman",    // netcode contributions
2156
                "Javier Martinez",   // "Malone3D" - EDuke 2.1.1 components
2150
                "Javier Martinez",   // "Malone3D" - EDuke 2.1.1 components