thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-05 15:43:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "TEMPORARY: Revert Got_AddPlayer and disable D_SendPlayerConfig"

Browse source 
This reverts commit 49e2f98beb.
This commit is contained in:
Sally Coolatta 2020-08-18 03:54:31 -04:00
parent ac29aa86b0
commit f5bf0371de
2 changed files with 142 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

189
src/d_clisrv.c
View file

@ -3598,19 +3598,15 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum)
UINT8 console; UINT8 console;
UINT8 splitscreenplayer = 0; UINT8 splitscreenplayer = 0;
UINT8 i; UINT8 i;
boolean rejoined;
player_t *newplayer;
if (playernum != serverplayer && !IsPlayerAdmin(playernum)) if (playernum != serverplayer && !IsPlayerAdmin(playernum))
{ {
// protect against hacked/buggy client // protect against hacked/buggy client
CONS_Alert(CONS_WARNING, M_GetText("Illegal add player command received from %s\n"), player_names[playernum]); CONS_Alert(CONS_WARNING, M_GetText("Illegal add player command received from %s\n"), player_names[playernum]);
if (server) if (server)
{ SendKick(playernum, KICK_MSG_CON_FAIL | KICK_MSG_KEEP_BODY);
UINT8 buf[2];
buf[0] = (UINT8)playernum;
buf[1] = KICK_MSG_CON_FAIL;
SendNetXCmd(XD_KICK, &buf, 2);
}
return; return;
} }
@ -3621,13 +3617,39 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum)
CONS_Debug(DBG_NETPLAY, "addplayer: %d %d %d\n", node, newplayernum, splitscreenplayer); CONS_Debug(DBG_NETPLAY, "addplayer: %d %d %d\n", node, newplayernum, splitscreenplayer);
// Clear player before joining, lest some things get set incorrectly rejoined = playeringame[newplayernum];
CL_ClearPlayer(newplayernum);
playeringame[newplayernum] = true; if (!rejoined)
G_AddPlayer(newplayernum); {
if (newplayernum+1 > doomcom->numslots) // Clear player before joining, lest some things get set incorrectly
doomcom->numslots = (INT16)(newplayernum+1); CL_ClearPlayer(newplayernum);
playeringame[newplayernum] = true;
G_AddPlayer(newplayernum);
if (newplayernum+1 > doomcom->numslots)
doomcom->numslots = (INT16)(newplayernum+1);
if (server && I_GetNodeAddress)
{
const char *address = I_GetNodeAddress(node);
char *port = NULL;
if (address) // MI: fix msvcrt.dll!_mbscat crash?
{
strcpy(playeraddress[newplayernum], address);
port = strchr(playeraddress[newplayernum], ':');
if (port)
*port = '\0';
}
}
}
newplayer = &players[newplayernum];
newplayer->jointime = 0;
newplayer->quittime = 0;
READSTRINGN(*p, player_names[newplayernum], MAXPLAYERNAME);
// the server is creating my player // the server is creating my player
if (node == mynode) if (node == mynode)
@ -3652,11 +3674,32 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum)
DEBFILE("spawning me\n"); DEBFILE("spawning me\n");
} }
ticcmd_oldangleturn[splitscreenplayer] = players[newplayernum].oldrelangleturn; ticcmd_oldangleturn[splitscreenplayer] = newplayer->oldrelangleturn;
P_ForceLocalAngle(&players[newplayernum], (angle_t)(players[newplayernum].angleturn << 16)); P_ForceLocalAngle(newplayer, (angle_t)(newplayer->angleturn << 16));
//D_SendPlayerConfig(); D_SendPlayerConfig();
addedtogame = true; addedtogame = true;
if (rejoined)
{
if (newplayer->mo)
{
newplayer->viewheight = P_GetPlayerViewHeight(newplayer);
if (newplayer->mo->eflags & MFE_VERTICALFLIP)
newplayer->viewz = newplayer->mo->z + newplayer->mo->height - newplayer->viewheight;
else
newplayer->viewz = newplayer->mo->z + newplayer->viewheight;
}
// wake up the status bar
ST_Start();
// wake up the heads up text
HU_Start();
if (camera[splitscreenplayer].chase)
P_ResetCamera(newplayer, &camera[splitscreenplayer]);
}
} }
players[newplayernum].splitscreenindex = splitscreenplayer; players[newplayernum].splitscreenindex = splitscreenplayer;
@ -3670,20 +3713,30 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum)
if (netgame) if (netgame)
{ {
if (server && cv_showjoinaddress.value) char joinmsg[256];
{
const char *address; if (rejoined)
if (I_GetNodeAddress && (address = I_GetNodeAddress(node)) != NULL) strcpy(joinmsg, M_GetText("\x82*%s has rejoined the game (player %d)"));
HU_AddChatText(va("\x82*Player %d has joined the game (node %d) (%s)", newplayernum+1, node, address), false); // merge join notification + IP to avoid clogging console/chat.
}
else else
HU_AddChatText(va("\x82*Player %d has joined the game (node %d)", newplayernum+1, node), false); // if you don't wanna see the join address. strcpy(joinmsg, M_GetText("\x82*%s has joined the game (player %d)"));
strcpy(joinmsg, va(joinmsg, player_names[newplayernum], newplayernum));
// Merge join notification + IP to avoid clogging console/chat
if (server && cv_showjoinaddress.value && I_GetNodeAddress)
{
const char *address = I_GetNodeAddress(node);
if (address)
strcat(joinmsg, va(" (%s)", address));
}
HU_AddChatText(joinmsg, false);
} }
if (server && multiplayer && motd[0] != '\0') if (server && multiplayer && motd[0] != '\0')
COM_BufAddText(va("sayto %d %s\n", newplayernum, motd)); COM_BufAddText(va("sayto %d %s\n", newplayernum, motd));
LUAh_PlayerJoin(newplayernum); if (!rejoined)
LUAh_PlayerJoin(newplayernum);
} }
// Xcmd XD_REMOVEPLAYER // Xcmd XD_REMOVEPLAYER
@ -3759,54 +3812,57 @@ static void Got_AddBot(UINT8 **p, INT32 playernum)
LUAh_PlayerJoin(newplayernum); LUAh_PlayerJoin(newplayernum);
} }
static boolean SV_AddWaitingPlayers(void) static boolean SV_AddWaitingPlayers(const char *name, const char *name2, const char *name3, const char *name4)
{ {
INT32 node, n, newplayer = false; INT32 node, n, newplayer = false;
UINT8 newplayernum = 0; UINT8 buf[4 + MAXPLAYERNAME];
UINT8 *buf_p = buf;
// What is the reason for this? Why can't newplayernum always be 0? INT32 newplayernum;
// Sal: Because the dedicated player is stupidly forced into players[0].....
if (dedicated)
newplayernum = 1;
for (node = 0; node < MAXNETNODES; node++) for (node = 0; node < MAXNETNODES; node++)
{ {
// splitscreen can allow 2+ players in one node // splitscreen can allow 2+ players in one node
for (; nodewaiting[node] > 0; nodewaiting[node]--) for (; nodewaiting[node] > 0; nodewaiting[node]--)
{ {
UINT8 buf[4];
UINT8 *buf_p = buf;
UINT8 nobotoverwrite;
newplayer = true; newplayer = true;
// search for a free playernum newplayernum = FindRejoinerNum(node);
// we can't use playeringame since it is not updated here if (newplayernum == -1)
for (; newplayernum < MAXPLAYERS; newplayernum++)
{ {
for (n = 0; n < MAXNETNODES; n++) UINT8 nobotoverwrite;
if (nodetoplayer[n] == newplayernum
|| nodetoplayer2[n] == newplayernum // search for a free playernum
|| nodetoplayer3[n] == newplayernum // we can't use playeringame since it is not updated here
|| nodetoplayer4[n] == newplayernum) for (newplayernum = dedicated ? 1 : 0; newplayernum < MAXPLAYERS; newplayernum++)
{
if (playeringame[newplayernum])
continue;
for (n = 0; n < MAXNETNODES; n++)
if (nodetoplayer[n] == newplayernum
|| nodetoplayer2[n] == newplayernum
|| nodetoplayer3[n] == newplayernum
|| nodetoplayer4[n] == newplayernum)
break;
if (n == MAXNETNODES)
break; break;
if (n == MAXNETNODES) }
break;
}
nobotoverwrite = newplayernum; nobotoverwrite = newplayernum;
while (playeringame[nobotoverwrite] while (playeringame[nobotoverwrite]
&& players[nobotoverwrite].bot && players[nobotoverwrite].bot
&& nobotoverwrite < MAXPLAYERS) && nobotoverwrite < MAXPLAYERS)
{ {
// Only overwrite bots if there are NO other slots available. // Overwrite bots if there are NO other slots available.
nobotoverwrite++; nobotoverwrite++;
} }
if (nobotoverwrite < MAXPLAYERS) if (nobotoverwrite < MAXPLAYERS)
{ {
newplayernum = nobotoverwrite; newplayernum = nobotoverwrite;
}
} }
// should never happen since we check the playernum // should never happen since we check the playernum
@ -3819,13 +3875,25 @@ static boolean SV_AddWaitingPlayers(void)
WRITEUINT8(buf_p, newplayernum); WRITEUINT8(buf_p, newplayernum);
if (playerpernode[node] < 1) if (playerpernode[node] < 1)
{
nodetoplayer[node] = newplayernum; nodetoplayer[node] = newplayernum;
WRITESTRINGN(buf_p, name, MAXPLAYERNAME);
}
else if (playerpernode[node] < 2) else if (playerpernode[node] < 2)
{
nodetoplayer2[node] = newplayernum; nodetoplayer2[node] = newplayernum;
WRITESTRINGN(buf_p, name2, MAXPLAYERNAME);
}
else if (playerpernode[node] < 3) else if (playerpernode[node] < 3)
{
nodetoplayer3[node] = newplayernum; nodetoplayer3[node] = newplayernum;
WRITESTRINGN(buf_p, name3, MAXPLAYERNAME);
}
else if (playerpernode[node] < 4) else if (playerpernode[node] < 4)
{
nodetoplayer4[node] = newplayernum; nodetoplayer4[node] = newplayernum;
WRITESTRINGN(buf_p, name4, MAXPLAYERNAME);
}
WRITEUINT8(buf_p, nodetoplayer[node]); // consoleplayer WRITEUINT8(buf_p, nodetoplayer[node]); // consoleplayer
WRITEUINT8(buf_p, playerpernode[node]); // splitscreen num WRITEUINT8(buf_p, playerpernode[node]); // splitscreen num
@ -3833,10 +3901,7 @@ static boolean SV_AddWaitingPlayers(void)
playerpernode[node]++; playerpernode[node]++;
SendNetXCmd(XD_ADDPLAYER, buf, buf_p - buf); SendNetXCmd(XD_ADDPLAYER, buf, buf_p - buf);
DEBFILE(va("Server added player %d node %d\n", newplayernum, node)); DEBFILE(va("Server added player %d node %d\n", newplayernum, node));
// use the next free slot (we can't put playeringame[newplayernum] = true here)
newplayernum++;
} }
} }
@ -3894,7 +3959,7 @@ boolean SV_SpawnServer(void)
else doomcom->numslots = 1; else doomcom->numslots = 1;
} }
return SV_AddWaitingPlayers(); // cv_playername[0].zstring, cv_playername[1].zstring, cv_playername[2].zstring, cv_playername[3].zstring return SV_AddWaitingPlayers(cv_playername[0].zstring, cv_playername[1].zstring, cv_playername[2].zstring, cv_playername[3].zstring);
#endif #endif
} }
@ -4074,7 +4139,7 @@ static void HandleConnect(SINT8 node)
SV_SendSaveGame(node); // send a complete game state SV_SendSaveGame(node); // send a complete game state
DEBFILE("send savegame\n"); DEBFILE("send savegame\n");
} }
SV_AddWaitingPlayers(); // names[0], names[1], names[2], names[3] SV_AddWaitingPlayers(names[0], names[1], names[2], names[3]);
joindelay += cv_joindelay.value * TICRATE; joindelay += cv_joindelay.value * TICRATE;
player_joining = true; player_joining = true;
} }

28
src/v_video.h
View file

@ -120,22 +120,24 @@ void V_CubeApply(UINT8 *red, UINT8 *green, UINT8 *blue);
#define V_USERHUDTRANS ((10-cv_translucenthud.value)<<V_ALPHASHIFT) #define V_USERHUDTRANS ((10-cv_translucenthud.value)<<V_ALPHASHIFT)
#define V_USERHUDTRANSDOUBLE ((10-min(cv_translucenthud.value*2, 10))<<V_ALPHASHIFT) #define V_USERHUDTRANSDOUBLE ((10-min(cv_translucenthud.value*2, 10))<<V_ALPHASHIFT)
#define V_RETURN8 0x00100000 // 8 pixel return instead of 12 #define V_AUTOFADEOUT 0x00100000 // used by CECHOs, automatic fade out when almost over
#define V_OFFSET 0x00200000 // account for offsets in patches #define V_RETURN8 0x00200000 // 8 pixel return instead of 12
#define V_ALLOWLOWERCASE 0x00400000 // (strings only) allow fonts that have lowercase letters to use them #define V_OFFSET 0x00400000 // account for offsets in patches
#define V_FLIP 0x00400000 // (patches only) Horizontal flip #define V_ALLOWLOWERCASE 0x00800000 // (strings only) allow fonts that have lowercase letters to use them
#define V_SLIDEIN 0x00800000 // Slide in from the sides on level load, depending on snap flags #define V_FLIP 0x00800000 // (patches only) Horizontal flip
#define V_CENTERNAMETAG 0x00800000 // (nametag only) center nametag lines
#define V_SNAPTOTOP 0x01000000 // for centering #define V_SNAPTOTOP 0x00800000 // for centering
#define V_SNAPTOBOTTOM 0x02000000 // for centering #define V_SNAPTOBOTTOM 0x01000000 // for centering
#define V_SNAPTOLEFT 0x04000000 // for centering #define V_SNAPTOLEFT 0x02000000 // for centering
#define V_SNAPTORIGHT 0x08000000 // for centering #define V_SNAPTORIGHT 0x04000000 // for centering
#define V_WRAPX 0x10000000 // Don't clamp texture on X (for HW mode) #define V_WRAPX 0x08000000 // Don't clamp texture on X (for HW mode)
#define V_WRAPY 0x20000000 // Don't clamp texture on Y (for HW mode) #define V_WRAPY 0x10000000 // Don't clamp texture on Y (for HW mode)
#define V_NOSCALESTART 0x40000000 // don't scale x, y, start coords #define V_NOSCALESTART 0x20000000 // don't scale x, y, start coords
#define V_SPLITSCREEN 0x80000000 // Add half of screen width or height automatically depending on player number #define V_SPLITSCREEN 0x40000000 // Add half of screen width or height automatically depending on player number
#define V_SLIDEIN 0x80000000 // Slide in from the sides on level load, depending on snap flags
// defines for old functions // defines for old functions
#define V_DrawPatch(x,y,s,p) V_DrawFixedPatch((x)<<FRACBITS, (y)<<FRACBITS, FRACUNIT, s|V_NOSCALESTART|V_NOSCALEPATCH, p, NULL) #define V_DrawPatch(x,y,s,p) V_DrawFixedPatch((x)<<FRACBITS, (y)<<FRACBITS, FRACUNIT, s|V_NOSCALESTART|V_NOSCALEPATCH, p, NULL)