zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-13 07:57:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- added TheShooter7/Aroenai's patch for switch on pickup menu option.

Browse source 
SVN r2531 (trunk)
This commit is contained in:
Christoph Oelckers 2010-08-13 06:27:22 +00:00
parent d904d8276e
commit 564fb6a723
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/m_menu.cpp
View file

@ -196,6 +196,7 @@ static void M_ChangeClass (int choice);
static void M_ChangeGender (int choice); static void M_ChangeGender (int choice);
static void M_ChangeSkin (int choice); static void M_ChangeSkin (int choice);
static void M_ChangeAutoAim (int choice); static void M_ChangeAutoAim (int choice);
static void M_ChangeSwitchPickup (int choice);
static void PickPlayerClass (); static void PickPlayerClass ();
// EXTERNAL DATA DECLARATIONS ---------------------------------------------- // EXTERNAL DATA DECLARATIONS ----------------------------------------------
@ -203,6 +204,7 @@ static void PickPlayerClass ();
EXTERN_CVAR (String, playerclass) EXTERN_CVAR (String, playerclass)
EXTERN_CVAR (String, name) EXTERN_CVAR (String, name)
EXTERN_CVAR (Int, team) EXTERN_CVAR (Int, team)
EXTERN_CVAR(Bool, neverswitchonpickup)
extern bool sendpause; extern bool sendpause;
extern int flagsvar; extern int flagsvar;
@ -545,7 +547,8 @@ static oldmenuitem_t PlayerSetupMenu[] =
{ 2,0,'t',NULL,M_ChangeClass, CR_UNTRANSLATED}, { 2,0,'t',NULL,M_ChangeClass, CR_UNTRANSLATED},
{ 2,0,'s',NULL,M_ChangeSkin, CR_UNTRANSLATED}, { 2,0,'s',NULL,M_ChangeSkin, CR_UNTRANSLATED},
{ 2,0,'e',NULL,M_ChangeGender, CR_UNTRANSLATED}, { 2,0,'e',NULL,M_ChangeGender, CR_UNTRANSLATED},
{ 2,0,'a',NULL,M_ChangeAutoAim, CR_UNTRANSLATED} { 2,0,'a',NULL,M_ChangeAutoAim, CR_UNTRANSLATED},
{ 2,0,'p',NULL,M_ChangeSwitchPickup, CR_UNTRANSLATED}
}; };
enum enum
@ -2360,6 +2363,13 @@ static void M_PlayerSetupDrawer ()
autoaim <= 2 ? "High" : autoaim <= 2 ? "High" :
autoaim <= 3 ? "Very High" : "Always", autoaim <= 3 ? "Very High" : "Always",
DTA_Clean, true, TAG_DONE); DTA_Clean, true, TAG_DONE);
// Draw Switch on Pickup setting
x = SmallFont->StringWidth ("Switch on Pickup") + 8 + PSetupDef.x;
screen->DrawText (SmallFont, label, PSetupDef.x, PSetupDef.y + LINEHEIGHT*9+yo, "Switch on Pickup", DTA_Clean, true, TAG_DONE);
screen->DrawText (SmallFont, value, x, PSetupDef.y + LINEHEIGHT*9+yo,
neverswitchonpickup == false ? "Yes" : "No",
DTA_Clean, true, TAG_DONE);
} }
// A 32x32 cloud rendered with Photoshop, plus some other filters // A 32x32 cloud rendered with Photoshop, plus some other filters
@ -2668,6 +2678,14 @@ static void M_ChangeAutoAim (int choice)
autoaim = aim; autoaim = aim;
} }
static void M_ChangeSwitchPickup (int choice)
{
if (!choice)
neverswitchonpickup = (neverswitchonpickup == 1) ? 0 : 1;
else
neverswitchonpickup = (neverswitchonpickup == 0) ? 1 : 0;
}
static void M_EditPlayerName (int choice) static void M_EditPlayerName (int choice)
{ {
// we are going to be intercepting all chars // we are going to be intercepting all chars