stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-24 18:21:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'next' into 2214

Browse source
This commit is contained in:
spherallic 2024-07-02 22:16:31 +02:00
commit a9a16ea841
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/hu_stuff.c
View file

@ -204,7 +204,7 @@ void HU_LoadGraphics(void)
HU_SetFontProperties(&hu_font, 0, 4, 8, 12); HU_SetFontProperties(&hu_font, 0, 4, 8, 12);
HU_SetFontProperties(&tny_font, 0, 2, 4, 12); HU_SetFontProperties(&tny_font, 0, 2, 4, 12);
HU_SetFontProperties(&cred_font, 0, 16, 16, 16); HU_SetFontProperties(&cred_font, 0, 16, 16, 16);
HU_SetFontProperties(&lt_font, 0, 16, 20, 20); HU_SetFontProperties(&lt_font, 0, 16, 20, 16);
HU_SetFontProperties(&ntb_font, 2, 4, 20, 21); HU_SetFontProperties(&ntb_font, 2, 4, 20, 21);
HU_SetFontProperties(&nto_font, 0, 4, 20, 21); HU_SetFontProperties(&nto_font, 0, 4, 20, 21);

4
src/netcode/i_tcp.c
View file

@ -317,7 +317,11 @@ init_upnpc_once(struct upnpdata *upnpuserdata)
I_OutputMsg(M_GetText("Found UPnP device:\n desc: %s\n st: %s\n"), I_OutputMsg(M_GetText("Found UPnP device:\n desc: %s\n st: %s\n"),
dev->descURL, dev->st); dev->descURL, dev->st);
#if (MINIUPNPC_API_VERSION >= 18)
UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr), NULL, 0);
#else
UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr)); UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr));
#endif
I_OutputMsg(M_GetText("Local LAN IP address: %s\n"), lanaddr); I_OutputMsg(M_GetText("Local LAN IP address: %s\n"), lanaddr);
descXML = miniwget(dev->descURL, &descXMLsize, scope_id, &status_code); descXML = miniwget(dev->descURL, &descXMLsize, scope_id, &status_code);
if (descXML) if (descXML)

10
src/p_spec.c
View file

@ -2405,18 +2405,15 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
y = line->args[3] << FRACBITS; y = line->args[3] << FRACBITS;
z = line->args[4] << FRACBITS; z = line->args[4] << FRACBITS;
P_UnsetThingPosition(mo); P_SetOrigin(mo, mo->x + x, mo->y + y, mo->z + z);
mo->x += x;
mo->y += y;
mo->z += z;
P_SetThingPosition(mo);
if (mo->player) if (mo->player)
{ {
if (bot) // This might put poor Tails in a wall if he's too far behind! D: But okay, whatever! >:3 if (bot) // This might put poor Tails in a wall if he's too far behind! D: But okay, whatever! >:3
P_SetOrigin(bot, bot->x + x, bot->y + y, bot->z + z); P_SetOrigin(bot, bot->x + x, bot->y + y, bot->z + z);
if (splitscreen && mo->player == &players[secondarydisplayplayer] && camera2.chase) if (splitscreen && mo->player == &players[secondarydisplayplayer] && camera2.chase)
{ {
camera2.reset = true;
camera2.x += x; camera2.x += x;
camera2.y += y; camera2.y += y;
camera2.z += z; camera2.z += z;
@ -2424,6 +2421,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
} }
else if (camera.chase && mo->player == &players[displayplayer]) else if (camera.chase && mo->player == &players[displayplayer])
{ {
camera.reset = true;
camera.x += x; camera.x += x;
camera.y += y; camera.y += y;
camera.z += z; camera.z += z;