Commit 9147474a by James R.

Merge branch 'showjoinaddress-menu' into 'next'

Add a menu option for showjoinaddress; disable it by default See merge request !1115
parents 16362388 30043682
...@@ -157,7 +157,7 @@ ticcmd_t netcmds[BACKUPTICS][MAXPLAYERS]; ...@@ -157,7 +157,7 @@ ticcmd_t netcmds[BACKUPTICS][MAXPLAYERS];
static textcmdtic_t *textcmds[TEXTCMD_HASH_SIZE] = {NULL}; static textcmdtic_t *textcmds[TEXTCMD_HASH_SIZE] = {NULL};
consvar_t cv_showjoinaddress = {"showjoinaddress", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_showjoinaddress = {"showjoinaddress", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
static CV_PossibleValue_t playbackspeed_cons_t[] = {{1, "MIN"}, {10, "MAX"}, {0, NULL}}; static CV_PossibleValue_t playbackspeed_cons_t[] = {{1, "MIN"}, {10, "MAX"}, {0, NULL}};
consvar_t cv_playbackspeed = {"playbackspeed", "1", 0, playbackspeed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_playbackspeed = {"playbackspeed", "1", 0, playbackspeed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
......
...@@ -1663,8 +1663,11 @@ static menuitem_t OP_ServerOptionsMenu[] = ...@@ -1663,8 +1663,11 @@ static menuitem_t OP_ServerOptionsMenu[] =
#ifndef NONET #ifndef NONET
{IT_HEADER, NULL, "Advanced", NULL, 225}, {IT_HEADER, NULL, "Advanced", NULL, 225},
{IT_STRING | IT_CVAR | IT_CV_STRING, NULL, "Master server", &cv_masterserver, 231}, {IT_STRING | IT_CVAR | IT_CV_STRING, NULL, "Master server", &cv_masterserver, 231},
{IT_STRING | IT_CVAR, NULL, "Join delay", &cv_joindelay, 246}, {IT_STRING | IT_CVAR, NULL, "Join delay", &cv_joindelay, 246},
{IT_STRING | IT_CVAR, NULL, "Attempts to resynchronise", &cv_resynchattempts, 251}, {IT_STRING | IT_CVAR, NULL, "Attempts to resynchronise", &cv_resynchattempts, 251},
{IT_STRING | IT_CVAR, NULL, "Show IP Address of Joiners", &cv_showjoinaddress, 256},
#endif #endif
}; };
...@@ -8017,7 +8020,7 @@ static void M_SecretsMenu(INT32 choice) ...@@ -8017,7 +8020,7 @@ static void M_SecretsMenu(INT32 choice)
skyRoomMenuTranslations[i-1] = (UINT8)ul; skyRoomMenuTranslations[i-1] = (UINT8)ul;
SR_MainMenu[i].text = unlockables[ul].name; SR_MainMenu[i].text = unlockables[ul].name;
SR_MainMenu[i].alphaKey = (UINT8)unlockables[ul].height; SR_MainMenu[i].alphaKey = (UINT16)unlockables[ul].height;
if (unlockables[ul].type == SECRET_HEADER) if (unlockables[ul].type == SECRET_HEADER)
{ {
......
...@@ -327,7 +327,7 @@ typedef struct menuitem_s ...@@ -327,7 +327,7 @@ typedef struct menuitem_s
void *itemaction; void *itemaction;
// hotkey in menu or y of the item // hotkey in menu or y of the item
UINT8 alphaKey; UINT16 alphaKey;
} menuitem_t; } menuitem_t;
extern menuitem_t MP_RoomMenu[]; extern menuitem_t MP_RoomMenu[];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment