diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 02b6c40ff..002195ec1 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -964,10 +964,11 @@ void D_RegisterClientCommands(void) // g_input.c CV_RegisterVar(&cv_controlperkey); - CV_RegisterVar(&cv_turnsmooth); for (i = 0; i < MAXSPLITSCREENPLAYERS; i++) { + CV_RegisterVar(&cv_turnsmooth[i]); + CV_RegisterVar(&cv_turnaxis[i]); CV_RegisterVar(&cv_moveaxis[i]); CV_RegisterVar(&cv_camturnaxis[i]); @@ -1993,11 +1994,6 @@ static void Got_NameAndColor(UINT8 **cp, INT32 playernum) } else SetPlayerSkinByNum(playernum, skin); - -#ifdef HAVE_DISCORDRPC - if (playernum == consoleplayer) - DRPC_UpdatePresence(); -#endif } void SendWeaponPref(void) diff --git a/src/discord.c b/src/discord.c index 207a249a6..f94cd574d 100644 --- a/src/discord.c +++ b/src/discord.c @@ -49,6 +49,27 @@ discordRequest_t *discordRequestList = NULL; static char self_ip[IP_SIZE+1]; +/*-------------------------------------------------- + * const char *DRPC_HideUsername(const char *input) + * + * See header file for description. + * --------------------------------------------------*/ +const char *DRPC_HideUsername(const char *input) +{ + static char buffer[5]; + int i; + + buffer[0] = input[0]; + + for (i = 1; i < 4; ++i) + { + buffer[i] = '.'; + } + + buffer[4] = '\0'; + return buffer; +} + boolean drpc_init = false; /*-------------------------------------------------- @@ -105,7 +126,7 @@ static void DRPC_HandleReady(const DiscordUser *user) } else { - CONS_Printf("Discord: connected to %s#%s (%s)\n", user->username, user->discriminator, user->userId); + CONS_Printf("Discord: connected to %s (%s)\n", user->username, user->userId); } } @@ -241,8 +262,10 @@ static void DRPC_HandleJoinRequest(const DiscordUser *requestUser) newRequest->username = Z_Calloc(344, PU_STATIC, NULL); snprintf(newRequest->username, 344, "%s", requestUser->username); +#if 0 newRequest->discriminator = Z_Calloc(8, PU_STATIC, NULL); snprintf(newRequest->discriminator, 8, "%s", requestUser->discriminator); +#endif newRequest->userID = Z_Calloc(32, PU_STATIC, NULL); snprintf(newRequest->userID, 32, "%s", requestUser->userId); @@ -308,6 +331,9 @@ void DRPC_RemoveRequest(discordRequest_t *removeRequest) } Z_Free(removeRequest->username); +#if 0 + Z_Free(removeRequest->discriminator); +#endif Z_Free(removeRequest->userID); Z_Free(removeRequest); } diff --git a/src/discord.h b/src/discord.h index 131dc05f9..fa37c306b 100644 --- a/src/discord.h +++ b/src/discord.h @@ -29,7 +29,9 @@ extern struct discordInfo_s { typedef struct discordRequest_s { char *username; // Discord user name. +#if 0 // Good night, sweet prince... char *discriminator; // Discord discriminator (The little hashtag thing after the username). Separated for a "hide discriminators" cvar. +#endif char *userID; // The ID of the Discord user, gets used with Discord_Respond() // HAHAHA, no. @@ -44,6 +46,15 @@ typedef struct discordRequest_s { extern discordRequest_t *discordRequestList; +/*-------------------------------------------------- + * const char *DRPC_HideUsername(const char *input); + * + * Handle usernames while cv_discordstreamer is activated. + * (The loss of discriminators is still a dumbass regression + * that I will never forgive the Discord developers for.) + * --------------------------------------------------*/ + +const char *DRPC_HideUsername(const char *input); /*-------------------------------------------------- void DRPC_RemoveRequest(void); diff --git a/src/filesrch.c b/src/filesrch.c index 088911e54..628a221c2 100644 --- a/src/filesrch.c +++ b/src/filesrch.c @@ -44,7 +44,7 @@ consvar_t cv_addons_search_case = {"addons_search_case", "No", CV_SAVE, CV_YesNo static CV_PossibleValue_t addons_search_type_cons_t[] = {{0, "Start"}, {1, "Anywhere"}, {0, NULL}}; consvar_t cv_addons_search_type = {"addons_search_type", "Anywhere", CV_SAVE, addons_search_type_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; -char menupath[1024]; +char menupath[MAXFILEPATH]; size_t menupathindex[menudepth]; size_t menudepthleft = menudepth; @@ -111,7 +111,7 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want int found = 0; char *searchname; int depthleft = maxsearchdepth; - char searchpath[1024]; + char searchpath[MAXFILEPATH]; size_t *searchpathindex; dirhandle = (DIR**)malloc(maxsearchdepth * sizeof(DIR*)); diff --git a/src/filesrch.h b/src/filesrch.h index 697020c54..0a2da67b8 100644 --- a/src/filesrch.h +++ b/src/filesrch.h @@ -34,7 +34,8 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want #define menudepth 20 -extern char menupath[1024]; +#define MAXFILEPATH 1024 +extern char menupath[MAXFILEPATH]; extern size_t menupathindex[menudepth]; extern size_t menudepthleft; diff --git a/src/g_demo.c b/src/g_demo.c index 2018d8a8d..4b63a1578 100644 --- a/src/g_demo.c +++ b/src/g_demo.c @@ -3609,11 +3609,7 @@ void G_SaveDemo(void) writepoint++; size_t flen = 128 - (writepoint - demoname) - 4; - if (flen > 0 && flen < 128) - { - demo_slug[flen] = '\0'; - sprintf(writepoint, "%s.lmp", demo_slug); - } + snprintf(writepoint, flen, "%s.lmp", demo_slug); } } diff --git a/src/g_demo.h b/src/g_demo.h index 36458b240..3ce32c054 100644 --- a/src/g_demo.h +++ b/src/g_demo.h @@ -67,7 +67,7 @@ typedef enum { } menudemotype_e; typedef struct menudemo_s { - char filepath[256]; + char filepath[1023 + 256]; // see M_PrepReplayList and sizeof menupath menudemotype_e type; char title[65]; // Null-terminated for string prints diff --git a/src/g_game.c b/src/g_game.c index d3775fc6d..5c984ad87 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -1021,8 +1021,8 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) else th = 0; - if (th < SLOWTURNTICS) - tspeed = cv_turnsmooth.value == 2 ? 2 : 0; // slow turn + if (th < (cv_turnsmooth[forplayer].value * 3)) + tspeed = cv_turnsmooth[forplayer].value == 2 ? 2 : 0; // slow turn else tspeed = 1; diff --git a/src/g_game.h b/src/g_game.h index 6b5d1c8cc..249ecbff1 100644 --- a/src/g_game.h +++ b/src/g_game.h @@ -155,7 +155,6 @@ typedef enum // mouseaiming (looking up/down with the mouse or keyboard) #define KB_LOOKSPEED (1<<25) #define MAXPLMOVE (50) -#define SLOWTURNTICS (cv_turnsmooth.value * 3) // build an internal map name MAPxx from map number const char *G_BuildMapName(INT32 map); diff --git a/src/g_input.c b/src/g_input.c index 09ed3303a..e8bc8223e 100644 --- a/src/g_input.c +++ b/src/g_input.c @@ -37,7 +37,13 @@ static CV_PossibleValue_t turnsmooth_cons_t[] = {{2, "Slow"}, {1, "Fast"}, {0, " consvar_t cv_mousesens = {"mousesens", "20", CV_SAVE, mousesens_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_mouseysens = {"mouseysens", "20", CV_SAVE, mousesens_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_controlperkey = {"controlperkey", "One", CV_SAVE, onecontrolperkey_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_turnsmooth = {"turnsmoothing", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; + +consvar_t cv_turnsmooth[MAXSPLITSCREENPLAYERS] = { + {"turnsmoothing", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}, + {"turnsmoothing2", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}, + {"turnsmoothing3", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}, + {"turnsmoothing4", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL} +}; static void G_ResetPlayerDeviceRumble(INT32 player); static void rumble_off_handle(void); diff --git a/src/g_input.h b/src/g_input.h index 970560a35..ec4a9d795 100644 --- a/src/g_input.h +++ b/src/g_input.h @@ -110,7 +110,8 @@ typedef enum // mouse values are used once extern consvar_t cv_mousesens, cv_mouseysens; -extern consvar_t cv_controlperkey, cv_turnsmooth; +extern consvar_t cv_controlperkey; +extern consvar_t cv_turnsmooth[MAXSPLITSCREENPLAYERS]; extern consvar_t cv_rumble[MAXSPLITSCREENPLAYERS]; extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS]; diff --git a/src/hardware/hw_cache.c b/src/hardware/hw_cache.c index e48e2772a..edbd83b77 100644 --- a/src/hardware/hw_cache.c +++ b/src/hardware/hw_cache.c @@ -804,7 +804,7 @@ static void HWR_PrecacheLevelSprites(void) void HWR_PrecacheLevel(void) { - if (rendermode != render_opengl) + if (gamestate != GS_LEVEL) return; // Precache flats. diff --git a/src/hardware/hw_main.cpp b/src/hardware/hw_main.cpp index ad5bf1ba0..57ed12d70 100644 --- a/src/hardware/hw_main.cpp +++ b/src/hardware/hw_main.cpp @@ -277,6 +277,7 @@ static void CV_glshaders_OnChange(void) { // can't do palette rendering without shaders, so update the state if needed HWR_TogglePaletteRendering(); + HWR_PrecacheLevel(); } M_UpdateOGLMenu(); } @@ -294,18 +295,21 @@ static void CV_gltextureformat_OnChange(void) { ONLY_IF_GL_LOADED GL_SetSpecialState(HWD_SET_TEXTURE_FORMAT, cv_gltexturedepth.value); + HWR_PrecacheLevel(); } static void CV_filtermode_OnChange(void) { ONLY_IF_GL_LOADED GL_SetSpecialState(HWD_SET_TEXTUREFILTERMODE, cv_glfiltermode.value); + HWR_PrecacheLevel(); } static void CV_anisotropic_OnChange(void) { ONLY_IF_GL_LOADED GL_SetSpecialState(HWD_SET_TEXTUREANISOTROPICMODE, cv_glanisotropicmode.value); + HWR_PrecacheLevel(); } static void CV_glpaletterendering_OnChange(void) @@ -318,7 +322,9 @@ static void CV_glpaletterendering_OnChange(void) { HWR_CompileShaders(); HWR_TogglePaletteRendering(); + HWR_PrecacheLevel(); } + M_UpdateOGLMenu(); } diff --git a/src/k_hud.c b/src/k_hud.c index 71af43f5d..54b81a0f4 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -4333,7 +4333,7 @@ static void K_drawInput(void) target = 0; else // turning of multiple strengths! { - target = ((abs(cmd->driftturn) - 1)/125)+1; + target = ((abs(cmd->driftturn) - 1)/200)+1; // was 125, do we need another toggle for this? Zzz... if (target > 4) target = 4; if (cmd->driftturn < 0) diff --git a/src/m_menu.c b/src/m_menu.c index ed39e053f..3d8857b9a 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -3107,7 +3107,7 @@ static void M_AddonsInternal(void) break; } - strlcpy(menupath, pathname, 1024); + strlcpy(menupath, pathname, MAXFILEPATH); menupathindex[(menudepthleft = menudepth-1)] = strlen(menupath) + 1; if (menupath[menupathindex[menudepthleft]-2] != PATHSEP[0]) @@ -3220,9 +3220,9 @@ static void M_DrawTemperature(INT32 x, fixed_t t) static char *M_AddonsHeaderPath(void) { UINT32 len; - static char header[1024]; + static char header[MAXFILEPATH]; - strlcpy(header, va("%s folder%s", cv_addons_option.string, menupath+menupathindex[menudepth-1]-1), 1024); + strlcpy(header, va("%s folder%s", cv_addons_option.string, menupath+menupathindex[menudepth-1]-1), MAXFILEPATH); len = strlen(header); if (len > 34) { @@ -3958,9 +3958,7 @@ static void PrepReplayList(boolean reset) Lock_search_state(); - if (demolist_all) - Z_Free(demolist_all); - + Z_Free(demolist_all); demolist_all = Z_Calloc(sizeof(menudemo_t) * sizedirmenu, PU_STATIC, NULL); for (i = 0; i < sizedirmenu; i++) @@ -3978,9 +3976,9 @@ static void PrepReplayList(boolean reset) else { demolist_all[i].type = MD_NOTLOADED; - // FIXME - do something with buffer sizes. menupath is 1024 chars but filepath is only - // 256. I'm not really sure what to do here but don't want to leave warnings... - snprintf(demolist_all[i].filepath, 255, "%.254s%s", menupath, dirmenu[i] + DIR_STRING); + snprintf(demolist_all[i].filepath, sizeof(demolist_all[i].filepath), + // 255 = UINT8 limit. dirmenu entries are restricted to this length (see DIR_LEN). + "%s%.255s", menupath, dirmenu[i] + DIR_STRING); sprintf(demolist_all[i].title, "....."); } } @@ -10334,9 +10332,9 @@ static const char *M_GetDiscordName(discordRequest_t *r) return ""; if (cv_discordstreamer.value) - return r->username; + return DRPC_HideUsername(r->username); - return va("%s#%s", r->username, r->discriminator); + return r->username; } // (this goes in k_hud.c when merged into v2) diff --git a/src/m_menudefs.c b/src/m_menudefs.c index ca17cafa8..e02113026 100644 --- a/src/m_menudefs.c +++ b/src/m_menudefs.c @@ -645,16 +645,20 @@ static menuitem_t OP_ControlsMenu[] = {IT_CALL | IT_STRING, NULL, "Player 3 Controls...", &M_Setup3PControlsMenu, 30}, {IT_CALL | IT_STRING, NULL, "Player 4 Controls...", &M_Setup4PControlsMenu, 40}, - {IT_SUBMENU | IT_STRING, NULL, "Mouse Options...", &OP_MouseOptionsDef, 60}, + {IT_SUBMENU | IT_STRING, NULL, "Mouse Options...", &OP_MouseOptionsDef, 55}, - {IT_STRING | IT_CVAR, NULL, "Controls per key", &cv_controlperkey, 80}, - {IT_STRING | IT_CVAR, NULL, "Digital turn easing", &cv_turnsmooth, 90}, + {IT_STRING | IT_CVAR, NULL, "Controls per key", &cv_controlperkey, 75}, + + {IT_STRING | IT_CVAR, NULL, "Digital turn easing (P1)", &cv_turnsmooth[0], 85}, + {IT_STRING | IT_CVAR, NULL, "Digital turn easing (P2)", &cv_turnsmooth[1], 95}, + {IT_STRING | IT_CVAR, NULL, "Digital turn easing (P3)", &cv_turnsmooth[2], 105}, + {IT_STRING | IT_CVAR, NULL, "Digital turn easing (P4)", &cv_turnsmooth[3], 115}, // i hate our menus sincerly - {IT_STRING | IT_CVAR, NULL, "Lite Steer (P1)", &cv_litesteer[0], 110}, - {IT_STRING | IT_CVAR, NULL, "Lite Steer (P2)", &cv_litesteer[1], 120}, - {IT_STRING | IT_CVAR, NULL, "Lite Steer (P3)", &cv_litesteer[2], 130}, - {IT_STRING | IT_CVAR, NULL, "Lite Steer (P4)", &cv_litesteer[3], 140}, + {IT_STRING | IT_CVAR, NULL, "Lite Steer (P1)", &cv_litesteer[0], 135}, + {IT_STRING | IT_CVAR, NULL, "Lite Steer (P2)", &cv_litesteer[1], 145}, + {IT_STRING | IT_CVAR, NULL, "Lite Steer (P3)", &cv_litesteer[2], 155}, + {IT_STRING | IT_CVAR, NULL, "Lite Steer (P4)", &cv_litesteer[3], 165}, }; static const char* OP_ControlsTooltips[] = @@ -665,7 +669,10 @@ static const char* OP_ControlsTooltips[] = "Setup player 4 controls.", "Options for mouse control.", "Allowed amount of controls per key.", - "Turn smoothing for non-analog turning.", + "Turn smoothing for non-analog turning (Player 1).", + "Turn smoothing for non-analog turning (Player 2).", + "Turn smoothing for non-analog turning (Player 3).", + "Turn smoothing for non-analog turning (Player 4).", "Hold DOWN on d-pad/keyboard for shallow turns (Player 1).", "Hold DOWN on d-pad/keyboard for shallow turns (Player 2).", @@ -2435,7 +2442,7 @@ menu_t OP_MainDef = NULL }; -menu_t OP_ControlsDef = DEFAULTMENUSTYLE("M_CONTRO", OP_ControlsMenu, &OP_MainDef, 60, 30, OP_ControlsTooltips); +menu_t OP_ControlsDef = DEFAULTMENUSTYLE("M_CONTRO", OP_ControlsMenu, &OP_MainDef, 40, 15, OP_ControlsTooltips); //WTF menu_t OP_MouseOptionsDef = DEFAULTMENUSTYLE("M_CONTRO", OP_MouseOptionsMenu, &OP_ControlsDef, 60, 30, OP_MouseTooltips); menu_t OP_AllControlsDef = CONTROLMENUSTYLE(OP_AllControlsMenu, &OP_ControlsDef); diff --git a/src/r_skins.c b/src/r_skins.c index f0fbfcfd1..9d289f936 100644 --- a/src/r_skins.c +++ b/src/r_skins.c @@ -35,6 +35,8 @@ CV_PossibleValue_t Forceskin_cons_t[MAXSKINS+2]; +#include "discord.h" + INT32 numskins = 0; INT32 numallskins = 0; INT32 numlocalskins = 0; @@ -328,8 +330,14 @@ void SetPlayerSkinByNum(INT32 playernum, INT32 skinnum) if (player->mo) P_SetScale(player->mo, player->mo->scale); + // for replays: We have changed our skin mid-game; let the game know so it can do the same in the replay! demo_extradata[playernum] |= DXD_SKIN; +#ifdef HAVE_DISCORDRPC + if (player - players == consoleplayer) + DRPC_UpdatePresence(); +#endif + return; }