diff --git a/src/d_clisrv.h b/src/d_clisrv.h index 37cd03c57..d8a1acc22 100644 --- a/src/d_clisrv.h +++ b/src/d_clisrv.h @@ -659,7 +659,6 @@ extern char motd[254], server_context[8]; extern UINT8 playernode[MAXPLAYERS]; INT32 D_NumPlayers(void); -boolean D_IsPlayerHumanAndGaming(INT32 player_number); void D_ResetTiccmds(void); ticcmd_t *D_LocalTiccmd(UINT8 ss); diff --git a/src/d_netcmd.c b/src/d_netcmd.c index c528248a4..e9fc195cf 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -298,6 +298,8 @@ consvar_t cv_mouseturn = {"mouseturn", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, // Lagless camera! Yay! consvar_t cv_laglesscam = {"laglesscamera", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_verticallook = {"verticallook", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; + #if defined(HAVE_SDL) || defined(_WINDOWS) //joystick 1 and 2 consvar_t cv_usejoystick[MAXSPLITSCREENPLAYERS] = { {"use_joystick", "1", CV_SAVE|CV_CALL, usejoystick_cons_t, I_InitJoystick1, 0, NULL, NULL, 0, 0, NULL}, @@ -1075,6 +1077,8 @@ void D_RegisterClientCommands(void) CV_RegisterVar(&cv_laglesscam); + CV_RegisterVar(&cv_verticallook); + // ingame object placing COM_AddCommand("objectplace", Command_ObjectPlace_f); COM_AddCommand("writethings", Command_Writethings_f); diff --git a/src/d_netcmd.h b/src/d_netcmd.h index 1b9bd9808..ec58c7bfd 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -200,6 +200,8 @@ extern consvar_t cv_betainterscreen; extern consvar_t cv_laglesscam; +extern consvar_t cv_verticallook; + typedef enum { SKINMENUTYPE_SCROLL = 0, diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 85112be6d..f97b800e5 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -394,7 +394,7 @@ void HWR_ObjectLightLevelPost(gl_vissprite_t *spr, const sector_t *sector, INT32 if (semibright) { - *lightlevel = 192 + (*lightlevel >> 1); + *lightlevel = 128 + (*lightlevel >> 1); } } diff --git a/src/m_menu.c b/src/m_menu.c index 523930a01..51b6aa45e 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1886,11 +1886,12 @@ static menuitem_t OP_CamOptionsMenu[] = {IT_STRING | IT_CVAR, NULL, "Lagless Camera", &cv_laglesscam, 50}, {IT_STRING | IT_CVAR, NULL, "Camera Lookback Momentum", &cv_lookbackmom, 60}, + {IT_STRING | IT_CVAR, NULL, "Camera Vertical Look", &cv_verticallook, 70}, - {IT_STRING | IT_SUBMENU, NULL, "Player 1 Camera options...", &OP_Player1CamOptionsDef, 80}, - {IT_STRING | IT_SUBMENU, NULL, "Player 2 Camera options...", &OP_Player2CamOptionsDef, 90}, - {IT_STRING | IT_SUBMENU, NULL, "Player 3 Camera options...", &OP_Player3CamOptionsDef, 100}, - {IT_STRING | IT_SUBMENU, NULL, "Player 4 Camera options...", &OP_Player4CamOptionsDef, 110}, + {IT_STRING | IT_SUBMENU, NULL, "Player 1 Camera options...", &OP_Player1CamOptionsDef, 90}, + {IT_STRING | IT_SUBMENU, NULL, "Player 2 Camera options...", &OP_Player2CamOptionsDef, 100}, + {IT_STRING | IT_SUBMENU, NULL, "Player 3 Camera options...", &OP_Player3CamOptionsDef, 110}, + {IT_STRING | IT_SUBMENU, NULL, "Player 4 Camera options...", &OP_Player4CamOptionsDef, 120}, }; static const char* OP_CamOptionsTooltips[] = @@ -1899,6 +1900,7 @@ static const char* OP_CamOptionsTooltips[] = "Player field of view.", "Removes Camera Lag in netgames\nMay cause Camera stutters in poor net conditions.", "Should looking back inherit the Players Momentum?\nEither inherit Player Momentum or double of it\nmay make looking back while boosting or going in high speed less jarring", + "Allows looking up/down by holding aim forward/backward while standing still.", NULL, NULL, NULL, diff --git a/src/m_random.c b/src/m_random.c index 224e3d7da..dfabfe13c 100644 --- a/src/m_random.c +++ b/src/m_random.c @@ -14,8 +14,9 @@ #include "doomdef.h" #include "doomtype.h" -#include "k_stats.h" // kartstats.totalplaytime +#include "doomstat.h" // totalplaytime #include "i_system.h" // I_GetRandomBytes +#include "k_stats.h" // kartstats.totalplaytime #include "m_random.h" #include "m_fixed.h" diff --git a/src/p_pspr.h b/src/p_pspr.h index 4301e912d..89f6c1108 100644 --- a/src/p_pspr.h +++ b/src/p_pspr.h @@ -46,7 +46,6 @@ #define FF_BLENDMASK 0x7000 /// \brief shift for FF_BLENDMASK #define FF_BLENDSHIFT 12 - /// \brief preshifted blend flags minus 1 as effects don't distinguish between AST_COPY and AST_TRANSLUCENT #define FF_ADD ((AST_ADD-1)<