Merge remote-tracking branch 'origin/Saturn-Testing' into lugstuff

This commit is contained in:
Alug committed 2025-02-26 11:11:19 +01:00
commit fec04089c0
8 files changed
+15 -11

No files matched your search

-1
View File
@@ -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);
+4
View File
@@ -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);
+2
View File
@@ -200,6 +200,8 @@ extern consvar_t cv_betainterscreen;
extern consvar_t cv_laglesscam;
extern consvar_t cv_verticallook;
typedef enum
{
SKINMENUTYPE_SCROLL = 0,
+1 -1
View File
@@ -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);
}
}
+6 -4
View File
@@ -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,
+2 -1
View File
@@ -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"
-1
View File
@@ -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)<<FF_BLENDSHIFT)
#define FF_SUBTRACT ((AST_SUBTRACT-1)<<FF_BLENDSHIFT)
-3
View File
@@ -684,10 +684,7 @@ void P_Ticker(boolean run)
PS_STOP_TIMING(ps_lua_thinkframe_time);
}
// Run shield positioning
//P_RunShields();
P_RunOverlays();
P_RunShadows();
P_UpdateSpecials();