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

This commit is contained in:
Alug committed 2025-07-27 14:30:18 +02:00
commit c1f3c4cdbe
4 files changed
+13 -12

No files matched your search

+1 -1
View File
@@ -109,7 +109,7 @@ boolean addedtogame;
player_t players[MAXPLAYERS];
INT32 consoleplayer; // player taking events and displaying
INT32 displayplayers[MAXSPLITSCREENPLAYERS]; // view being displayed
INT32 displayplayers[MAXSPLITSCREENPLAYERS] = {0}; // view being displayed
tic_t gametic;
tic_t levelstarttic; // gametic at level start
+1 -1
View File
@@ -3168,7 +3168,7 @@ static void K_SpawnDriftSparks(player_t *player)
const boolean onground = P_IsObjectOnGround(player->mo);
// kinda sketchy
if (!cv_airsparks.value && onground)
if (!cv_airsparks.value && !onground)
return;
if (!player->kartstuff[k_drift] || player->kartstuff[k_driftcharge] < K_GetKartDriftSparkValue(player))
+6 -5
View File
@@ -6762,15 +6762,16 @@ static void M_DrawConnectMenu(void)
M_DrawServerLines(currentMenu->x, serverlistpage);
}
V_DrawFill(currentMenu->x, currentMenu->y, MAXSTRINGLENGTH*8+6, 8+6, 239);
INT32 input_y = currentMenu->menuitems[mp_connect_search].alphaKey;
V_DrawFill(currentMenu->x, currentMenu->y+input_y, MAXSTRINGLENGTH*8+6, 8+6, 239);
const INT32 xoff = 3, yoff = 3;
if (itemOn != 0)
V_DrawString(currentMenu->x+xoff, currentMenu->y+yoff, V_ALLOWLOWERCASE, menuinput.buffer);
if (itemOn != mp_connect_search)
V_DrawString(currentMenu->x+xoff, currentMenu->y+yoff+input_y, V_ALLOWLOWERCASE, menuinput.buffer);
else
M_DrawTextInput(currentMenu->x+xoff, currentMenu->y+yoff, &menuinput, 0);
M_DrawTextInput(currentMenu->x+xoff, currentMenu->y+yoff+input_y, &menuinput, 0);
localservercount = serverlistcount;
+5 -5
View File
@@ -574,10 +574,10 @@ static menuitem_t MP_PlayerSetupMenu[] =
#ifndef NONET
static menuitem_t MP_ConnectMenu[] =
{
{IT_STRING | IT_KEYHANDLER, NULL, "", M_HandleServerSearch,0},
{IT_STRING | IT_CVAR, NULL, "Sort By", &cv_serversort, 16},
{IT_STRING | IT_KEYHANDLER, NULL, "Page", M_HandleServerPage, 24},
{IT_STRING | IT_CALL, NULL, "Refresh", M_Refresh, 32},
{IT_STRING | IT_CVAR, NULL, "Sort By", &cv_serversort, 0},
{IT_STRING | IT_KEYHANDLER, NULL, "Page", M_HandleServerPage, 8},
{IT_STRING | IT_CALL, NULL, "Refresh", M_Refresh, 16},
{IT_STRING | IT_KEYHANDLER, NULL, "", M_HandleServerSearch,25},
{IT_STRING | IT_SPACE, NULL, "", M_Connect, 48},
{IT_STRING | IT_SPACE, NULL, "", M_Connect, 60},
@@ -593,10 +593,10 @@ static menuitem_t MP_ConnectMenu[] =
enum
{
mp_connect_search,
mp_connect_sort,
mp_connect_page,
mp_connect_refresh,
mp_connect_search,
FIRSTSERVERLINE
};
#endif