vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'keysmash' into 'master' 

(Mic)key('s Dick) Smasher

See merge request KartKrew/Kart!18
This commit is contained in:
Sryder 2018-10-01 14:58:31 -04:00
parent 005e3ce514 2c1db167da
commit 033667a0ee
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/m_menu.c
View File

@ -2795,6 +2795,7 @@ boolean M_Responder(event_t *ev)
{ {
// detach any keys associated with the game control // detach any keys associated with the game control
G_ClearControlKeys(setupcontrols, currentMenu->menuitems[itemOn].alphaKey); G_ClearControlKeys(setupcontrols, currentMenu->menuitems[itemOn].alphaKey);
S_StartSound(NULL, sfx_shldls);
return true; return true;
} }
@ -8673,23 +8674,22 @@ static void M_ChangecontrolResponse(event_t *ev)
setupcontrols[control][found] = ch-KEY_4JOY1+KEY_DBL4JOY1; setupcontrols[control][found] = ch-KEY_4JOY1+KEY_DBL4JOY1;
} }
else else
{ {
// check if change key1 or key2, or replace the two by the new // check if change key1 or key2, or shuffle them along in a queue
found = 0; found = 0;
if (setupcontrols[control][0] == KEY_NULL) if (setupcontrols[control][0] != KEY_NULL)
found++; {
if (setupcontrols[control][1] == KEY_NULL) found++;
found++; if (setupcontrols[control][1] != KEY_NULL)
if (found == 2) setupcontrols[control][0] = setupcontrols[control][1];
{ }
found = 0; G_CheckDoubleUsage(ch);
setupcontrols[control][1] = KEY_NULL; //replace key 1,clear key2 setupcontrols[control][found] = ch;
} }
G_CheckDoubleUsage(ch); S_StartSound(NULL, sfx_strpst);
setupcontrols[control][found] = ch;
}
} }
else
S_StartSound(NULL, sfx_skid);
M_StopMessage(0); M_StopMessage(0);
} }