Skip to content
Snippets Groups Projects
Commit f55623ef authored by Marco Z's avatar Marco Z
Browse files

Clear all control keys before loading defaults in LoadConfig

parent 71da6836
Branches
Tags
2 merge requests!488Merge in next and don't billboard papersprites in GL,!403Reset default controls for LOADCONFIG command
......@@ -1010,6 +1010,16 @@ void G_ClearControlKeys(INT32 (*setupcontrols)[2], INT32 control)
setupcontrols[control][1] = KEY_NULL;
}
void G_ClearAllControlKeys(void)
{
INT32 i;
for (i = 0; i < num_gamecontrols; i++)
{
G_ClearControlKeys(gamecontrol, i);
G_ClearControlKeys(gamecontrolbis, i);
}
}
//
// Returns the name of a key (or virtual key for mouse and joy)
// the input value being an keynum
......
......@@ -160,6 +160,7 @@ INT32 G_KeyStringtoNum(const char *keystr);
// detach any keys associated to the given game control
void G_ClearControlKeys(INT32 (*setupcontrols)[2], INT32 control);
void G_ClearAllControlKeys(void);
void Command_Setcontrol_f(void);
void Command_Setcontrol2_f(void);
void G_Controldefault(void);
......
......@@ -443,6 +443,7 @@ void Command_LoadConfig_f(void)
FIL_ForceExtension(configfile, ".cfg");
// load default control
G_ClearAllControlKeys();
G_Controldefault();
// temporarily reset execversion to default
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment