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

Merge branch 'ip-allow-letters' into 'master' 

Allow letters to be used in the "Specify IPv4 Address:" field

See merge request KartKrew/Kart-Public!36
This commit is contained in:
Sryder 2019-01-26 16:45:22 -05:00
parent 5b9e6502f9 eb29063ef1
commit e45b2ea257
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/m_menu.c
View File

@ -7708,7 +7708,7 @@ static void M_StartServerMenu(INT32 choice)
// CONNECT VIA IP // CONNECT VIA IP
// ============== // ==============
static char setupm_ip[16]; static char setupm_ip[28];
#endif #endif
static UINT8 setupm_pselect = 1; static UINT8 setupm_pselect = 1;
@ -7741,12 +7741,12 @@ Update the maxplayers label...
V_DrawFill(x+5, y+4+5, /*16*8 + 6,*/ BASEVIDWIDTH - 2*(x+5), 8+6, 239); V_DrawFill(x+5, y+4+5, /*16*8 + 6,*/ BASEVIDWIDTH - 2*(x+5), 8+6, 239);
// draw name string // draw name string
V_DrawString(x+8,y+12, V_MONOSPACE, setupm_ip); V_DrawString(x+8,y+12, V_ALLOWLOWERCASE, setupm_ip);
// draw text cursor for name // draw text cursor for name
if (itemOn == 8 if (itemOn == 8
&& skullAnimCounter < 4) //blink cursor && skullAnimCounter < 4) //blink cursor
V_DrawCharacter(x+8+V_StringWidth(setupm_ip, V_MONOSPACE),y+12,'_',false); V_DrawCharacter(x+8+V_StringWidth(setupm_ip, V_ALLOWLOWERCASE),y+12,'_',false);
#endif #endif
// character bar, ripped off the color bar :V // character bar, ripped off the color bar :V
@ -7960,10 +7960,11 @@ static void M_HandleConnectIP(INT32 choice)
default: default:
l = strlen(setupm_ip); l = strlen(setupm_ip);
if (l >= 16-1) if (l >= 28-1)
break; break;
if (choice == 46 || (choice >= 48 && choice <= 57)) // Rudimentary number and period enforcing // Rudimentary number and period enforcing - also allows letters so hostnames can be used instead
if ((choice >= '-' && choice <= ':') || (choice >= 'A' && choice <= 'Z') || (choice >= 'a' && choice <= 'z'))
{ {
S_StartSound(NULL,sfx_menu1); // Tails S_StartSound(NULL,sfx_menu1); // Tails
setupm_ip[l] = (char)choice; setupm_ip[l] = (char)choice;
@ -7977,7 +7978,6 @@ static void M_HandleConnectIP(INT32 choice)
setupm_ip[l] = (char)choice; setupm_ip[l] = (char)choice;
setupm_ip[l+1] = 0; setupm_ip[l+1] = 0;
} }
break; break;
} }