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

Merge remote-tracking branch 'srb2public/master' into merge-srb2

This commit is contained in:
SeventhSentinel 2019-01-05 18:42:58 -05:00
parent 73542c008c d5870e6f8a
commit daec4f9f7e
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/m_menu.c
View File

@ -8892,7 +8892,7 @@ static void M_DrawControl(void)
#undef controlheight
static INT32 controltochange;
static char controltochangetext[55];
static char controltochangetext[33];
static void M_ChangecontrolResponse(event_t *ev)
{
@ -8970,7 +8970,8 @@ static void M_ChangecontrolResponse(event_t *ev)
}
else if (ch == KEY_PAUSE)
{
static char tmp[155];
// This buffer assumes a 125-character message plus a 32-character control name (per controltochangetext buffer size)
static char tmp[158];
menu_t *prev = currentMenu->prevMenu;
if (controltochange == gc_pause)
@ -8994,12 +8995,14 @@ static void M_ChangecontrolResponse(event_t *ev)
static void M_ChangeControl(INT32 choice)
{
static char tmp[55];
// This buffer assumes a 35-character message (per below) plus a max control name limit of 32 chars (per controltochangetext)
// If you change the below message, then change the size of this buffer!
static char tmp[68];
controltochange = currentMenu->menuitems[choice].alphaKey;
sprintf(tmp, M_GetText("Hit the new key for\n%s\nESC for Cancel"),
currentMenu->menuitems[choice].text);
strncpy(controltochangetext, currentMenu->menuitems[choice].text, 55);
strlcpy(controltochangetext, currentMenu->menuitems[choice].text, 33);
M_StartMessage(tmp, M_ChangecontrolResponse, MM_EVENTHANDLER);
}