add bindable freecam toggle
This commit is contained in:
1 parent
6bb72c363f
commit
1922b32799
4 files changed
+41
-30
No files matched your search
@@ -1554,6 +1554,11 @@ boolean G_Responder(event_t *ev)
|
||||
{
|
||||
K_ToggleDirector();
|
||||
}
|
||||
if (ev->data1 == gamecontrol[gc_freecam][0]
|
||||
|| ev->data1 == gamecontrol[gc_freecam][1])
|
||||
{
|
||||
P_ToggleDemoCamera();
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
|
||||
@@ -902,6 +902,7 @@ static const char *gamecontrolname[num_gamecontrols] =
|
||||
"custom2",
|
||||
"custom3",
|
||||
"director",
|
||||
"freecam",
|
||||
};
|
||||
|
||||
#define NUMKEYNAMES (sizeof (keynames)/sizeof (keyname_t))
|
||||
|
||||
@@ -100,6 +100,7 @@ typedef enum
|
||||
gc_custom2, // Lua scriptable
|
||||
gc_custom3, // Lua scriptable
|
||||
gc_director,
|
||||
gc_freecam, // Toggle for freecam while ingame
|
||||
num_gamecontrols
|
||||
} gamecontrols_e;
|
||||
|
||||
|
||||
+34
-30
@@ -1182,6 +1182,7 @@ static menuitem_t OP_AllControlsMenu[] =
|
||||
{
|
||||
{IT_SUBMENU|IT_STRING, NULL, "Gamepad Options...", &OP_Joystick1Def, 0},
|
||||
{IT_CALL|IT_STRING, NULL, "Reset to defaults", M_ResetControls, 8},
|
||||
|
||||
//{IT_SPACE, NULL, NULL, NULL, 0},
|
||||
{IT_HEADER, NULL, "Gameplay Controls", NULL, 0},
|
||||
{IT_SPACE, NULL, NULL, NULL, 0},
|
||||
@@ -1194,26 +1195,33 @@ static menuitem_t OP_AllControlsMenu[] =
|
||||
{IT_CONTROL, NULL, "Aim Forward", M_ChangeControl, gc_aimforward },
|
||||
{IT_CONTROL, NULL, "Aim Backward", M_ChangeControl, gc_aimbackward},
|
||||
{IT_CONTROL, NULL, "Look Backward", M_ChangeControl, gc_lookback },
|
||||
|
||||
{IT_HEADER, NULL, "Miscelleanous Controls", NULL, 0},
|
||||
{IT_SPACE, NULL, NULL, NULL, 0},
|
||||
{IT_CONTROL, NULL, "Chat", M_ChangeControl, gc_talkkey },
|
||||
//{IT_CONTROL, NULL, "Team Chat", M_ChangeControl, gc_teamkey },
|
||||
//{IT_CONTROL, NULL, "Team Chat", M_ChangeControl, gc_teamkey },
|
||||
{IT_CONTROL, NULL, "Show Rankings", M_ChangeControl, gc_scores },
|
||||
{IT_CONTROL, NULL, "Change Viewpoint", M_ChangeControl, gc_viewpoint },
|
||||
{IT_CONTROL, NULL, "Reset Camera", M_ChangeControl, gc_camreset },
|
||||
{IT_CONTROL, NULL, "Toggle First-Person", M_ChangeControl, gc_camtoggle },
|
||||
{IT_CONTROL, NULL, "Pause", M_ChangeControl, gc_pause },
|
||||
{IT_CONTROL, NULL, "Screenshot", M_ChangeControl, gc_screenshot },
|
||||
{IT_CONTROL, NULL, "Toggle GIF Recording", M_ChangeControl, gc_recordgif },
|
||||
{IT_CONTROL, NULL, "Open/Close Menu (ESC)", M_ChangeControl, gc_systemmenu },
|
||||
{IT_CONTROL, NULL, "Developer Console", M_ChangeControl, gc_console },
|
||||
{IT_HEADER, NULL, "Spectator Controls", NULL, 0},
|
||||
|
||||
{IT_HEADER, NULL, "Camera Controls", NULL, 0},
|
||||
{IT_SPACE, NULL, NULL, NULL, 0},
|
||||
{IT_CONTROL, NULL, "Become Spectator", M_ChangeControl, gc_spectate },
|
||||
{IT_CONTROL, NULL, "Toggle Freecam", M_ChangeControl, gc_freecam },
|
||||
{IT_CONTROL, NULL, "Look Up", M_ChangeControl, gc_lookup },
|
||||
{IT_CONTROL, NULL, "Look Down", M_ChangeControl, gc_lookdown },
|
||||
{IT_CONTROL, NULL, "Center View", M_ChangeControl, gc_centerview },
|
||||
{IT_CONTROL, NULL, "Change Viewpoint", M_ChangeControl, gc_viewpoint },
|
||||
{IT_CONTROL, NULL, "Reset Camera", M_ChangeControl, gc_camreset },
|
||||
//{IT_CONTROL, NULL, "Toggle First-Person", M_ChangeControl, gc_camtoggle },
|
||||
|
||||
{IT_HEADER, NULL, "Spectator Controls", NULL, 0},
|
||||
{IT_SPACE, NULL, NULL, NULL, 0},
|
||||
{IT_CONTROL, NULL, "Become Spectator", M_ChangeControl, gc_spectate },
|
||||
{IT_CONTROL, NULL, "Toggle Director", M_ChangeControl, gc_director },
|
||||
|
||||
{IT_HEADER, NULL, "Custom Lua Actions", NULL, 0},
|
||||
{IT_SPACE, NULL, NULL, NULL, 0},
|
||||
{IT_CONTROL, NULL, "Custom Action 1", M_ChangeControl, gc_custom1 },
|
||||
@@ -12082,12 +12090,11 @@ static void M_Setup1PControlsMenu(INT32 choice)
|
||||
// Unhide P1-only controls
|
||||
OP_AllControlsMenu[15].status = IT_CONTROL; // Chat
|
||||
OP_AllControlsMenu[16].status = IT_CONTROL; // Rankings
|
||||
// 18 is Reset Camera, 19 is Toggle Chasecam
|
||||
OP_AllControlsMenu[20].status = IT_CONTROL; // Pause
|
||||
OP_AllControlsMenu[21].status = IT_CONTROL; // Screenshot
|
||||
OP_AllControlsMenu[22].status = IT_CONTROL; // GIF
|
||||
OP_AllControlsMenu[23].status = IT_CONTROL; // System Menu
|
||||
OP_AllControlsMenu[24].status = IT_CONTROL; // Console
|
||||
OP_AllControlsMenu[17].status = IT_CONTROL; // Pause
|
||||
OP_AllControlsMenu[18].status = IT_CONTROL; // Screenshot
|
||||
OP_AllControlsMenu[19].status = IT_CONTROL; // GIF
|
||||
OP_AllControlsMenu[20].status = IT_CONTROL; // System Menu
|
||||
OP_AllControlsMenu[21].status = IT_CONTROL; // Console
|
||||
|
||||
M_SetupNextMenu(&OP_AllControlsDef);
|
||||
}
|
||||
@@ -12105,12 +12112,11 @@ static void M_Setup2PControlsMenu(INT32 choice)
|
||||
// Hide P1-only controls
|
||||
OP_AllControlsMenu[15].status = IT_GRAYEDOUT2; // Chat
|
||||
OP_AllControlsMenu[16].status = IT_GRAYEDOUT2; // Rankings
|
||||
// 18 is Reset Camera, 19 is Toggle Chasecam
|
||||
OP_AllControlsMenu[20].status = IT_GRAYEDOUT2; // Pause
|
||||
OP_AllControlsMenu[21].status = IT_GRAYEDOUT2; // Screenshot
|
||||
OP_AllControlsMenu[22].status = IT_GRAYEDOUT2; // GIF
|
||||
OP_AllControlsMenu[23].status = IT_GRAYEDOUT2; // System Menu
|
||||
OP_AllControlsMenu[24].status = IT_GRAYEDOUT2; // Console
|
||||
OP_AllControlsMenu[17].status = IT_GRAYEDOUT2; // Pause
|
||||
OP_AllControlsMenu[18].status = IT_GRAYEDOUT2; // Screenshot
|
||||
OP_AllControlsMenu[19].status = IT_GRAYEDOUT2; // GIF
|
||||
OP_AllControlsMenu[20].status = IT_GRAYEDOUT2; // System Menu
|
||||
OP_AllControlsMenu[21].status = IT_GRAYEDOUT2; // Console
|
||||
|
||||
M_SetupNextMenu(&OP_AllControlsDef);
|
||||
}
|
||||
@@ -12128,12 +12134,11 @@ static void M_Setup3PControlsMenu(INT32 choice)
|
||||
// Hide P1-only controls
|
||||
OP_AllControlsMenu[15].status = IT_GRAYEDOUT2; // Chat
|
||||
OP_AllControlsMenu[16].status = IT_GRAYEDOUT2; // Rankings
|
||||
// 18 is Reset Camera, 19 is Toggle Chasecam
|
||||
OP_AllControlsMenu[20].status = IT_GRAYEDOUT2; // Pause
|
||||
OP_AllControlsMenu[21].status = IT_GRAYEDOUT2; // Screenshot
|
||||
OP_AllControlsMenu[22].status = IT_GRAYEDOUT2; // GIF
|
||||
OP_AllControlsMenu[23].status = IT_GRAYEDOUT2; // System Menu
|
||||
OP_AllControlsMenu[24].status = IT_GRAYEDOUT2; // Console
|
||||
OP_AllControlsMenu[17].status = IT_GRAYEDOUT2; // Pause
|
||||
OP_AllControlsMenu[18].status = IT_GRAYEDOUT2; // Screenshot
|
||||
OP_AllControlsMenu[19].status = IT_GRAYEDOUT2; // GIF
|
||||
OP_AllControlsMenu[20].status = IT_GRAYEDOUT2; // System Menu
|
||||
OP_AllControlsMenu[21].status = IT_GRAYEDOUT2; // Console
|
||||
|
||||
M_SetupNextMenu(&OP_AllControlsDef);
|
||||
}
|
||||
@@ -12151,12 +12156,11 @@ static void M_Setup4PControlsMenu(INT32 choice)
|
||||
// Hide P1-only controls
|
||||
OP_AllControlsMenu[15].status = IT_GRAYEDOUT2; // Chat
|
||||
OP_AllControlsMenu[16].status = IT_GRAYEDOUT2; // Rankings
|
||||
// 18 is Reset Camera, 19 is Toggle Chasecam
|
||||
OP_AllControlsMenu[20].status = IT_GRAYEDOUT2; // Pause
|
||||
OP_AllControlsMenu[21].status = IT_GRAYEDOUT2; // Screenshot
|
||||
OP_AllControlsMenu[22].status = IT_GRAYEDOUT2; // GIF
|
||||
OP_AllControlsMenu[23].status = IT_GRAYEDOUT2; // System Menu
|
||||
OP_AllControlsMenu[24].status = IT_GRAYEDOUT2; // Console
|
||||
OP_AllControlsMenu[17].status = IT_GRAYEDOUT2; // Pause
|
||||
OP_AllControlsMenu[18].status = IT_GRAYEDOUT2; // Screenshot
|
||||
OP_AllControlsMenu[19].status = IT_GRAYEDOUT2; // GIF
|
||||
OP_AllControlsMenu[20].status = IT_GRAYEDOUT2; // System Menu
|
||||
OP_AllControlsMenu[21].status = IT_GRAYEDOUT2; // Console
|
||||
|
||||
M_SetupNextMenu(&OP_AllControlsDef);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user