From b2441114e8da63b442386f8577494c3d215a9f02 Mon Sep 17 00:00:00 2001
From: LJ Sonic <lamr@free.fr>
Date: Tue, 1 Aug 2023 18:24:07 +0200
Subject: [PATCH] Reapply recent netcode changes
---
src/g_demo.c | 4 +-
src/netcode/client_connection.c | 34 +-
src/netcode/client_connection.h | 2 +-
src/netcode/commands.c | 2 +-
src/netcode/commands.h | 2 +-
src/netcode/d_clisrv.c | 270 +++++++++++---
src/netcode/d_clisrv.h | 8 +-
src/netcode/d_net.c | 33 +-
src/netcode/d_net.h | 2 +-
src/netcode/d_netcmd.c | 600 +++++++++++++++++---------------
src/netcode/d_netcmd.h | 14 +-
src/netcode/d_netfil.c | 4 +-
src/netcode/d_netfil.h | 2 +-
src/netcode/gamestate.c | 5 +-
src/netcode/gamestate.h | 2 +-
src/netcode/http-mserv.c | 30 +-
src/netcode/i_addrinfo.c | 2 +-
src/netcode/i_addrinfo.h | 2 +-
src/netcode/i_net.h | 13 +-
src/netcode/i_tcp.c | 73 ++--
src/netcode/i_tcp.h | 2 +-
src/netcode/mserv.c | 10 +-
src/netcode/mserv.h | 6 +-
src/netcode/net_command.c | 16 +-
src/netcode/net_command.h | 2 +-
src/netcode/protocol.h | 5 +-
src/netcode/server_connection.c | 22 +-
src/netcode/server_connection.h | 2 +-
src/netcode/tic_command.c | 61 ++--
src/netcode/tic_command.h | 2 +-
src/snake.c | 70 +++-
src/snake.h | 3 +
32 files changed, 839 insertions(+), 466 deletions(-)
diff --git a/src/g_demo.c b/src/g_demo.c
index dea80e793..0a5114351 100644
--- a/src/g_demo.c
+++ b/src/g_demo.c
@@ -39,7 +39,7 @@
#include "v_video.h"
#include "lua_hook.h"
#include "md5.h" // demo checksums
-#include "d_netfil.h" // G_CheckDemoExtraFiles
+#include "netcode/d_netfil.h" // G_CheckDemoExtraFiles
boolean timingdemo; // if true, exit with report on completion
boolean nodrawers; // for comparative timing purposes
@@ -1885,7 +1885,7 @@ UINT8 G_CmpDemoTime(char *oldname, char *newname)
switch(oldversion) // demoversion
{
case DEMOVERSION: // latest always supported
- case 0x000f: // The previous demoversions also supported
+ case 0x000f: // The previous demoversions also supported
case 0x000e:
case 0x000d: // all that changed between then and now was longer color name
case 0x000c:
diff --git a/src/netcode/client_connection.c b/src/netcode/client_connection.c
index d363d7d5a..8155d1b33 100644
--- a/src/netcode/client_connection.c
+++ b/src/netcode/client_connection.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2022 by Sonic Team Junior.
+// Copyright (C) 1999-2023 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -17,11 +17,12 @@
#include "../d_main.h"
#include "../f_finale.h"
#include "../g_game.h"
-#include "../i_gamepad.h"
+#include "../g_input.h"
#include "i_net.h"
#include "../i_system.h"
#include "../i_time.h"
#include "../i_video.h"
+#include "../keys.h"
#include "../m_menu.h"
#include "../m_misc.h"
#include "../snake.h"
@@ -233,6 +234,7 @@ static boolean CL_AskFileList(INT32 firstfile)
boolean CL_SendJoin(void)
{
UINT8 localplayers = 1;
+ char const *player2name;
if (netgame)
CONS_Printf(M_GetText("Sending join request...\n"));
netbuffer->packettype = PT_CLIENTJOIN;
@@ -250,8 +252,14 @@ boolean CL_SendJoin(void)
if (splitscreen)
CleanupPlayerName(1, cv_playername2.zstring); // 1 is a HACK? oh no
+ // Avoid empty string on bots to avoid softlocking in singleplayer
+ if (botingame)
+ player2name = strcmp(cv_playername.zstring, "Tails") == 0 ? "Tail" : "Tails";
+ else
+ player2name = cv_playername2.zstring;
+
strncpy(netbuffer->u.clientcfg.names[0], cv_playername.zstring, MAXPLAYERNAME);
- strncpy(netbuffer->u.clientcfg.names[1], cv_playername2.zstring, MAXPLAYERNAME);
+ strncpy(netbuffer->u.clientcfg.names[1], player2name, MAXPLAYERNAME);
return HSendPacket(servernode, true, 0, sizeof (clientconfig_pak));
}
@@ -470,9 +478,9 @@ void CL_UpdateServerList(boolean internetsearch, INT32 room)
static void M_ConfirmConnect(event_t *ev)
{
- if (ev->type == ev_keydown || ev->type == ev_gamepad_down)
+ if (ev->type == ev_keydown)
{
- if ((ev->type == ev_keydown && (ev->key == ' ' || ev->key == 'y' || ev->key == KEY_ENTER)) || (ev->type == ev_gamepad_down && ev->which == 0 && ev->key == GAMEPAD_BUTTON_A))
+ if (ev->key == ' ' || ev->key == 'y' || ev->key == KEY_ENTER || ev->key == KEY_JOY1)
{
if (totalfilesrequestednum > 0)
{
@@ -487,7 +495,7 @@ static void M_ConfirmConnect(event_t *ev)
M_ClearMenus(true);
}
- else if ((ev->type == ev_keydown && (ev->key == 'n' || ev->key == KEY_ESCAPE)) || (ev->type == ev_gamepad_down && ev->which == 0 && ev->key == GAMEPAD_BUTTON_B))
+ else if (ev->key == 'n' || ev->key == KEY_ESCAPE || ev->key == KEY_JOY1 + 3)
{
cl_mode = CL_ABORTED;
M_ClearMenus(true);
@@ -663,7 +671,7 @@ static const char * InvalidServerReason (serverinfo_pak *info)
case REFUSE_SLOTS_FULL:
return va(
"Maximum players reached: %d\n" EOT,
- info->maxplayer);
+ info->maxplayer - D_NumBots());
default:
if (info->refusereason)
{
@@ -893,11 +901,12 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
// my hand has been forced and I am dearly sorry for this awful hack :vomit:
for (; eventtail != eventhead; eventtail = (eventtail+1) & (MAXEVENTS-1))
{
- G_MapEventsToControls(&events[eventtail]);
+ if (!Snake_JoyGrabber(snake, &events[eventtail]))
+ G_MapEventsToControls(&events[eventtail]);
}
}
- if (gamekeydown[KEY_ESCAPE] || gamepads[0].buttons[GAMEPAD_BUTTON_B] || cl_mode == CL_ABORTED)
+ if (gamekeydown[KEY_ESCAPE] || gamekeydown[KEY_JOY1+1] || cl_mode == CL_ABORTED)
{
CONS_Printf(M_GetText("Network game synchronization aborted.\n"));
M_StartMessage(M_GetText("Network game synchronization aborted.\n\nPress ESC\n"), NULL, MM_NOTHING);
@@ -922,7 +931,7 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
{
if (!snake)
{
- F_MenuPresTicker(true); // title sky
+ F_MenuPresTicker(); // title sky
F_TitleScreenTicker(true);
F_TitleScreenDrawer();
}
@@ -1020,6 +1029,9 @@ void CL_ConnectToServer(void)
}
while (!(cl_mode == CL_CONNECTED && (client || (server && nodewaited <= pnumnodes))));
+ if (netgame)
+ F_StartWaitingPlayers();
+
DEBFILE(va("Synchronisation Finished\n"));
displayplayer = consoleplayer;
@@ -1136,6 +1148,8 @@ void PT_ServerCFG(SINT8 node)
maketic = gametic = neededtic = (tic_t)LONG(netbuffer->u.servercfg.gametic);
G_SetGametype(netbuffer->u.servercfg.gametype);
modifiedgame = netbuffer->u.servercfg.modifiedgame;
+ if (netbuffer->u.servercfg.usedCheats)
+ G_SetUsedCheats(true);
memcpy(server_context, netbuffer->u.servercfg.server_context, 8);
}
diff --git a/src/netcode/client_connection.h b/src/netcode/client_connection.h
index 74cff61ff..4d75160d4 100644
--- a/src/netcode/client_connection.h
+++ b/src/netcode/client_connection.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2022 by Sonic Team Junior.
+// Copyright (C) 1999-2023 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/netcode/commands.c b/src/netcode/commands.c
index 4d9a48b6b..4228027d2 100644
--- a/src/netcode/commands.c
+++ b/src/netcode/commands.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2022 by Sonic Team Junior.
+// Copyright (C) 1999-2023 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/netcode/commands.h b/src/netcode/commands.h
index 5ff4d1cae..d328114ee 100644
--- a/src/netcode/commands.h
+++ b/src/netcode/commands.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2022 by Sonic Team Junior.
+// Copyright (C) 1999-2023 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/netcode/d_clisrv.c b/src/netcode/d_clisrv.c
index 18eae580c..f06192f2c 100644
--- a/src/netcode/d_clisrv.c
+++ b/src/netcode/d_clisrv.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2022 by Sonic Team Junior.
+// Copyright (C) 1999-2023 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -25,8 +25,6 @@
#include "../st_stuff.h"
#include "../hu_stuff.h"
#include "../keys.h"
-#include "../g_input.h"
-#include "../i_gamepad.h"
#include "../m_menu.h"
#include "../console.h"
#include "d_netfil.h"
@@ -34,7 +32,6 @@
#include "../p_saveg.h"
#include "../z_zone.h"
#include "../p_local.h"
-#include "../p_haptic.h"
#include "../m_misc.h"
#include "../am_map.h"
#include "../m_random.h"
@@ -103,6 +100,8 @@ boolean acceptnewnode = true;
UINT16 software_MAXPACKETLENGTH;
+static tic_t gametime = 0;
+
static CV_PossibleValue_t netticbuffer_cons_t[] = {{0, "MIN"}, {3, "MAX"}, {0, NULL}};
consvar_t cv_netticbuffer = CVAR_INIT ("netticbuffer", "1", CV_SAVE, netticbuffer_cons_t, NULL);
@@ -114,6 +113,8 @@ consvar_t cv_blamecfail = CVAR_INIT ("blamecfail", "Off", CV_SAVE|CV_NETVAR, CV_
static CV_PossibleValue_t playbackspeed_cons_t[] = {{1, "MIN"}, {10, "MAX"}, {0, NULL}};
consvar_t cv_playbackspeed = CVAR_INIT ("playbackspeed", "1", 0, playbackspeed_cons_t, NULL);
+consvar_t cv_dedicatedidletime = CVAR_INIT ("dedicatedidletime", "10", CV_SAVE, CV_Unsigned, NULL);
+
void ResetNode(INT32 node)
{
memset(&netnodes[node], 0, sizeof(*netnodes));
@@ -210,14 +211,13 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum)
if (server && I_GetNodeAddress)
{
+ char addressbuffer[64];
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';
+ strcpy(addressbuffer, address);
+ strcpy(playeraddress[newplayernum],
+ I_NetSplitAddress(addressbuffer, NULL));
}
}
}
@@ -744,6 +744,9 @@ void SV_ResetServer(void)
CV_RevertNetVars();
+ // Ensure synched when creating a new server
+ M_CopyGameData(serverGamedata, clientGamedata);
+
DEBFILE("\n-=-=-=-=-=-=-= Server Reset =-=-=-=-=-=-=-\n\n");
}
@@ -997,6 +1000,45 @@ static void PT_Ping(SINT8 node, INT32 netconsole)
}
}
+static void PT_BasicKeepAlive(SINT8 node, INT32 netconsole)
+{
+ if (client)
+ return;
+
+ // This should probably still timeout though, as the node should always have a player 1 number
+ if (netconsole == -1)
+ return;
+
+ // If a client sends this it should mean they are done receiving the savegame
+ netnodes[node].sendingsavegame = false;
+
+ // As long as clients send keep alives, the server can keep running, so reset the timeout
+ /// \todo Use a separate cvar for that kind of timeout?
+ netnodes[node].freezetimeout = I_GetTime() + connectiontimeout;
+ return;
+}
+
+// Confusing, but this DOESN'T send PT_NODEKEEPALIVE, it sends PT_BASICKEEPALIVE
+// Used during wipes to tell the server that a node is still connected
+static void CL_SendClientKeepAlive(void)
+{
+ netbuffer->packettype = PT_BASICKEEPALIVE;
+
+ HSendPacket(servernode, false, 0, 0);
+}
+
+static void SV_SendServerKeepAlive(void)
+{
+ for (INT32 n = 1; n < MAXNETNODES; n++)
+ {
+ if (netnodes[n].ingame)
+ {
+ netbuffer->packettype = PT_BASICKEEPALIVE;
+ HSendPacket(n, false, 0, 0);
+ }
+ }
+}
+
/** Handles a packet received from a node that isn't in game
*
* \param node The packet sender
@@ -1052,6 +1094,7 @@ static void HandlePacketFromPlayer(SINT8 node)
netconsole = 0;
else
netconsole = netnodes[node].player;
+
#ifdef PARANOIA
if (netconsole >= MAXPLAYERS)
I_Error("bad table nodetoplayer: node %d player %d", doomcom->remotenode, netconsole);
@@ -1068,6 +1111,7 @@ static void HandlePacketFromPlayer(SINT8 node)
case PT_NODEKEEPALIVEMIS:
PT_ClientCmd(node, netconsole);
break;
+ case PT_BASICKEEPALIVE : PT_BasicKeepAlive (node, netconsole); break;
case PT_TEXTCMD : PT_TextCmd (node, netconsole); break;
case PT_TEXTCMD2 : PT_TextCmd (node, netconsole); break;
case PT_LOGIN : PT_Login (node, netconsole); break;
@@ -1209,9 +1253,76 @@ boolean TryRunTics(tic_t realtics)
}
}
+static void UpdatePingTable(void)
+{
+ if (server)
+ {
+ if (netgame && !(gametime % 35)) // update once per second.
+ PingUpdate();
+ // update node latency values so we can take an average later.
+ for (INT32 i = 0; i < MAXPLAYERS; i++)
+ if (playeringame[i] && playernode[i] != UINT8_MAX)
+ realpingtable[i] += G_TicsToMilliseconds(GetLag(playernode[i]));
+ pingmeasurecount++;
+ }
+}
+
+// Handle timeouts to prevent definitive freezes from happenning
+static void HandleNodeTimeouts(void)
+{
+ if (server)
+ {
+ for (INT32 i = 1; i < MAXNETNODES; i++)
+ if (netnodes[i].ingame && netnodes[i].freezetimeout < I_GetTime())
+ Net_ConnectionTimeout(i);
+
+ // In case the cvar value was lowered
+ if (joindelay)
+ joindelay = min(joindelay - 1, 3 * (tic_t)cv_joindelay.value * TICRATE);
+ }
+}
+
+// Keep the network alive while not advancing tics!
+void NetKeepAlive(void)
+{
+ tic_t nowtime;
+ INT32 realtics;
+
+ nowtime = I_GetTime();
+ realtics = nowtime - gametime;
+
+ // return if there's no time passed since the last call
+ if (realtics <= 0) // nothing new to update
+ return;
+
+ UpdatePingTable();
+
+ GetPackets();
+
+#ifdef MASTERSERVER
+ MasterClient_Ticker();
+#endif
+
+ if (client)
+ {
+ // send keep alive
+ CL_SendClientKeepAlive();
+ // No need to check for resynch because we aren't running any tics
+ }
+ else
+ {
+ SV_SendServerKeepAlive();
+ }
+
+ // No else because no tics are being run and we can't resynch during this
+
+ Net_AckTicker();
+ HandleNodeTimeouts();
+ FileSendTicker();
+}
+
void NetUpdate(void)
{
- static tic_t gametime = 0;
static tic_t resptime = 0;
tic_t nowtime;
INT32 realtics;
@@ -1221,6 +1332,7 @@ void NetUpdate(void)
if (realtics <= 0) // nothing new to update
return;
+
if (realtics > 5)
{
if (server)
@@ -1229,18 +1341,73 @@ void NetUpdate(void)
realtics = 5;
}
+ if (server && dedicated && gamestate == GS_LEVEL)
+ {
+ const tic_t dedicatedidletime = cv_dedicatedidletime.value * TICRATE;
+ static tic_t dedicatedidletimeprev = 0;
+ static tic_t dedicatedidle = 0;
+
+ if (dedicatedidletime > 0)
+ {
+ INT32 i;
+
+ for (i = 1; i < MAXNETNODES; ++i)
+ if (netnodes[i].ingame)
+ {
+ if (dedicatedidle >= dedicatedidletime)
+ {
+ CONS_Printf("DEDICATED: Awakening from idle (Node %d detected...)\n", i);
+ dedicatedidle = 0;
+ }
+ break;
+ }
+
+ if (i == MAXNETNODES)
+ {
+ if (leveltime == 2)
+ {
+ // On next tick...
+ dedicatedidle = dedicatedidletime-1;
+ }
+ else if (dedicatedidle >= dedicatedidletime)
+ {
+ if (D_GetExistingTextcmd(gametic, 0) || D_GetExistingTextcmd(gametic+1, 0))
+ {
+ CONS_Printf("DEDICATED: Awakening from idle (Netxcmd detected...)\n");
+ dedicatedidle = 0;
+ }
+ else
+ {
+ realtics = 0;
+ }
+ }
+ else if ((dedicatedidle += realtics) >= dedicatedidletime)
+ {
+ const char *idlereason = "at round start";
+ if (leveltime > 3)
+ idlereason = va("for %d seconds", dedicatedidle/TICRATE);
+
+ CONS_Printf("DEDICATED: No nodes %s, idling...\n", idlereason);
+ realtics = 0;
+ dedicatedidle = dedicatedidletime;
+ }
+ }
+ }
+ else
+ {
+ if (dedicatedidletimeprev > 0 && dedicatedidle >= dedicatedidletimeprev)
+ {
+ CONS_Printf("DEDICATED: Awakening from idle (Idle disabled...)\n");
+ }
+ dedicatedidle = 0;
+ }
+
+ dedicatedidletimeprev = dedicatedidletime;
+ }
+
gametime = nowtime;
- if (server)
- {
- if (netgame && !(gametime % 35)) // update once per second.
- PingUpdate();
- // update node latency values so we can take an average later.
- for (INT32 i = 0; i < MAXPLAYERS; i++)
- if (playeringame[i] && playernode[i] != UINT8_MAX)
- realpingtable[i] += G_TicsToMilliseconds(GetLag(playernode[i]));
- pingmeasurecount++;
- }
+ UpdatePingTable();
if (client)
maketic = neededtic;
@@ -1270,17 +1437,18 @@ void NetUpdate(void)
}
else
{
- if (!demoplayback)
+ if (!demoplayback && realtics > 0)
{
hu_redownloadinggamestate = false;
firstticstosend = gametic;
for (INT32 i = 0; i < MAXNETNODES; i++)
- if (netnodes[i].ingame && netnodes[i].tic < firstticstosend)
+ if (netnodes[i].ingame)
{
- firstticstosend = netnodes[i].tic;
+ if (netnodes[i].tic < firstticstosend)
+ firstticstosend = netnodes[i].tic;
- if (maketic + 1 >= netnodes[i].tic + BACKUPTICS)
+ if (maketic + realtics >= netnodes[i].tic + BACKUPTICS - TICRATE)
Net_ConnectionTimeout(i);
}
@@ -1302,20 +1470,10 @@ void NetUpdate(void)
}
Net_AckTicker();
-
- // Handle timeouts to prevent definitive freezes from happenning
- if (server)
- {
- for (INT32 i = 1; i < MAXNETNODES; i++)
- if (netnodes[i].ingame && netnodes[i].freezetimeout < I_GetTime())
- Net_ConnectionTimeout(i);
-
- // In case the cvar value was lowered
- if (joindelay)
- joindelay = min(joindelay - 1, 3 * (tic_t)cv_joindelay.value * TICRATE);
- }
+ HandleNodeTimeouts();
nowtime /= NEWTICRATERATIO;
+
if (nowtime > resptime)
{
resptime = nowtime;
@@ -1338,22 +1496,22 @@ void D_ClientServerInit(void)
DEBFILE(va("- - -== SRB2 v%d.%.2d.%d "VERSIONSTRING" debugfile ==- - -\n",
VERSION/100, VERSION%100, SUBVERSION));
- COM_AddCommand("getplayernum", Command_GetPlayerNum);
- COM_AddCommand("kick", Command_Kick);
- COM_AddCommand("ban", Command_Ban);
- COM_AddCommand("banip", Command_BanIP);
- COM_AddCommand("clearbans", Command_ClearBans);
- COM_AddCommand("showbanlist", Command_ShowBan);
- COM_AddCommand("reloadbans", Command_ReloadBan);
- COM_AddCommand("connect", Command_connect);
- COM_AddCommand("nodes", Command_Nodes);
- COM_AddCommand("resendgamestate", Command_ResendGamestate);
+ COM_AddCommand("getplayernum", Command_GetPlayerNum, COM_LUA);
+ COM_AddCommand("kick", Command_Kick, COM_LUA);
+ COM_AddCommand("ban", Command_Ban, COM_LUA);
+ COM_AddCommand("banip", Command_BanIP, COM_LUA);
+ COM_AddCommand("clearbans", Command_ClearBans, COM_LUA);
+ COM_AddCommand("showbanlist", Command_ShowBan, COM_LUA);
+ COM_AddCommand("reloadbans", Command_ReloadBan, COM_LUA);
+ COM_AddCommand("connect", Command_connect, COM_LUA);
+ COM_AddCommand("nodes", Command_Nodes, COM_LUA);
+ COM_AddCommand("resendgamestate", Command_ResendGamestate, COM_LUA);
#ifdef PACKETDROP
- COM_AddCommand("drop", Command_Drop);
- COM_AddCommand("droprate", Command_Droprate);
+ COM_AddCommand("drop", Command_Drop, COM_LUA);
+ COM_AddCommand("droprate", Command_Droprate, COM_LUA);
#endif
#ifdef _DEBUG
- COM_AddCommand("numnodes", Command_Numnodes);
+ COM_AddCommand("numnodes", Command_Numnodes, COM_LUA);
#endif
RegisterNetXCmd(XD_KICK, Got_KickCmd);
@@ -1422,6 +1580,20 @@ INT32 D_NumPlayers(void)
return num;
}
+/** Similar to the above, but counts only bots.
+ * Purpose is to remove bots from both the player count and the
+ * max player count on the server view
+*/
+INT32 D_NumBots(void)
+{
+ INT32 num = 0, ix;
+ for (ix = 0; ix < MAXPLAYERS; ix++)
+ if (playeringame[ix] && players[ix].bot)
+ num++;
+ return num;
+}
+
+
//
// Consistancy
//
diff --git a/src/netcode/d_clisrv.h b/src/netcode/d_clisrv.h
index 0abd638ce..d87ead9ec 100644
--- a/src/netcode/d_clisrv.h
+++ b/src/netcode/d_clisrv.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2022 by Sonic Team Junior.
+// Copyright (C) 1999-2023 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -73,7 +73,7 @@ extern UINT32 realpingtable[MAXPLAYERS];
extern UINT32 playerpingtable[MAXPLAYERS];
extern tic_t servermaxping;
-extern consvar_t cv_netticbuffer, cv_resynchattempts, cv_blamecfail, cv_playbackspeed;
+extern consvar_t cv_netticbuffer, cv_resynchattempts, cv_blamecfail, cv_playbackspeed, cv_dedicatedidletime;
// Used in d_net, the only dependence
void D_ClientServerInit(void);
@@ -81,6 +81,9 @@ void D_ClientServerInit(void);
// Create any new ticcmds and broadcast to other players.
void NetUpdate(void);
+// Maintain connections to nodes without timing them all out.
+void NetKeepAlive(void);
+
void GetPackets(void);
void ResetNode(INT32 node);
INT16 Consistancy(void);
@@ -118,6 +121,7 @@ extern char motd[254], server_context[8];
extern UINT8 playernode[MAXPLAYERS];
INT32 D_NumPlayers(void);
+INT32 D_NumBots(void);
tic_t GetLag(INT32 node);
diff --git a/src/netcode/d_net.c b/src/netcode/d_net.c
index a4b0778e3..cfb1963b9 100644
--- a/src/netcode/d_net.c
+++ b/src/netcode/d_net.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2022 by Sonic Team Junior.
+// Copyright (C) 1999-2023 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -760,6 +760,8 @@ static const char *packettypename[NUMPACKETTYPE] =
"ASKLUAFILE",
"HASLUAFILE",
+ "PT_BASICKEEPALIVE",
+
"FILEFRAGMENT",
"FILEACK",
"FILERECEIVED",
@@ -818,6 +820,9 @@ static void DebugPrintpacket(const char *header)
(UINT32)ExpandTics(netbuffer->u.clientpak.client_tic, doomcom->remotenode),
(UINT32)ExpandTics (netbuffer->u.clientpak.resendfrom, doomcom->remotenode));
break;
+ case PT_BASICKEEPALIVE:
+ fprintf(debugfile, " wipetime\n");
+ break;
case PT_TEXTCMD:
case PT_TEXTCMD2:
fprintf(debugfile, " length %d\n ", netbuffer->u.textcmd[0]);
@@ -1140,26 +1145,32 @@ static void Internal_FreeNodenum(INT32 nodenum)
(void)nodenum;
}
+char *I_NetSplitAddress(char *host, char **port)
+{
+ boolean v4 = (strchr(host, '.') != NULL);
+
+ host = strtok(host, v4 ? ":" : "[]");
+
+ if (port)
+ *port = strtok(NULL, ":");
+
+ return host;
+}
+
SINT8 I_NetMakeNode(const char *hostname)
{
SINT8 newnode = -1;
if (I_NetMakeNodewPort)
{
char *localhostname = strdup(hostname);
- char *t = localhostname;
- const char *port;
+ char *port;
if (!localhostname)
return newnode;
- // retrieve portnum from address!
- strtok(localhostname, ":");
- port = strtok(NULL, ":");
- // remove the port in the hostname as we've it already
- while ((*t != ':') && (*t != '\0'))
- t++;
- *t = '\0';
+ // retrieve portnum from address!
+ hostname = I_NetSplitAddress(localhostname, &port);
- newnode = I_NetMakeNodewPort(localhostname, port);
+ newnode = I_NetMakeNodewPort(hostname, port);
free(localhostname);
}
return newnode;
diff --git a/src/netcode/d_net.h b/src/netcode/d_net.h
index 039f5b3b4..549f2b93c 100644
--- a/src/netcode/d_net.h
+++ b/src/netcode/d_net.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2022 by Sonic Team Junior.
+// Copyright (C) 1999-2023 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/netcode/d_netcmd.c b/src/netcode/d_netcmd.c
index 0d1785510..8f5b433bc 100644
--- a/src/netcode/d_netcmd.c
+++ b/src/netcode/d_netcmd.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2022 by Sonic Team Junior.
+// Copyright (C) 1999-2023 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -21,7 +21,6 @@
#include "../g_game.h"
#include "../hu_stuff.h"
#include "../g_input.h"
-#include "../i_gamepad.h"
#include "../m_menu.h"
#include "../r_local.h"
#include "../r_skins.h"
@@ -52,6 +51,7 @@
#include "../m_anigif.h"
#include "../md5.h"
#include "../m_perfstats.h"
+#include "../u_list.h"
#ifdef NETGAME_DEVMODE
#define CV_RESTRICT CV_NETVAR
@@ -184,6 +184,14 @@ static CV_PossibleValue_t mouse2port_cons_t[] = {{1, "COM1"}, {2, "COM2"}, {3, "
{0, NULL}};
#endif
+#ifdef LJOYSTICK
+static CV_PossibleValue_t joyport_cons_t[] = {{1, "/dev/js0"}, {2, "/dev/js1"}, {3, "/dev/js2"},
+ {4, "/dev/js3"}, {0, NULL}};
+#else
+// accept whatever value - it is in fact the joystick device number
+#define usejoystick_cons_t NULL
+#endif
+
static CV_PossibleValue_t teamscramble_cons_t[] = {{0, "Off"}, {1, "Random"}, {2, "Points"}, {0, NULL}};
static CV_PossibleValue_t startingliveslimit_cons_t[] = {{1, "MIN"}, {99, "MAX"}, {0, NULL}};
@@ -197,37 +205,37 @@ static CV_PossibleValue_t matchboxes_cons_t[] = {{0, "Normal"}, {1, "Mystery"},
static CV_PossibleValue_t chances_cons_t[] = {{0, "MIN"}, {9, "MAX"}, {0, NULL}};
static CV_PossibleValue_t pause_cons_t[] = {{0, "Server"}, {1, "All"}, {0, NULL}};
-consvar_t cv_showinputjoy = CVAR_INIT ("showinputjoy", "Off", 0, CV_OnOff, NULL);
+consvar_t cv_showinputjoy = CVAR_INIT ("showinputjoy", "Off", CV_ALLOWLUA, CV_OnOff, NULL);
#ifdef NETGAME_DEVMODE
static consvar_t cv_fishcake = CVAR_INIT ("fishcake", "Off", CV_CALL|CV_NOSHOWHELP|CV_RESTRICT, CV_OnOff, Fishcake_OnChange);
#endif
static consvar_t cv_dummyconsvar = CVAR_INIT ("dummyconsvar", "Off", CV_CALL|CV_NOSHOWHELP, CV_OnOff, DummyConsvar_OnChange);
-consvar_t cv_restrictskinchange = CVAR_INIT ("restrictskinchange", "Yes", CV_SAVE|CV_NETVAR|CV_CHEAT, CV_YesNo, NULL);
-consvar_t cv_allowteamchange = CVAR_INIT ("allowteamchange", "Yes", CV_SAVE|CV_NETVAR, CV_YesNo, NULL);
+consvar_t cv_restrictskinchange = CVAR_INIT ("restrictskinchange", "Yes", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, CV_YesNo, NULL);
+consvar_t cv_allowteamchange = CVAR_INIT ("allowteamchange", "Yes", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_YesNo, NULL);
-consvar_t cv_startinglives = CVAR_INIT ("startinglives", "3", CV_SAVE|CV_NETVAR|CV_CHEAT, startingliveslimit_cons_t, NULL);
+consvar_t cv_startinglives = CVAR_INIT ("startinglives", "3", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, startingliveslimit_cons_t, NULL);
static CV_PossibleValue_t respawntime_cons_t[] = {{1, "MIN"}, {30, "MAX"}, {0, "Off"}, {0, NULL}};
-consvar_t cv_respawntime = CVAR_INIT ("respawndelay", "3", CV_SAVE|CV_NETVAR|CV_CHEAT, respawntime_cons_t, NULL);
+consvar_t cv_respawntime = CVAR_INIT ("respawndelay", "3", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, respawntime_cons_t, NULL);
-consvar_t cv_competitionboxes = CVAR_INIT ("competitionboxes", "Mystery", CV_SAVE|CV_NETVAR|CV_CHEAT, competitionboxes_cons_t, NULL);
+consvar_t cv_competitionboxes = CVAR_INIT ("competitionboxes", "Mystery", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, competitionboxes_cons_t, NULL);
static CV_PossibleValue_t seenames_cons_t[] = {{0, "Off"}, {1, "Colorless"}, {2, "Team"}, {3, "Ally/Foe"}, {0, NULL}};
-consvar_t cv_seenames = CVAR_INIT ("seenames", "Ally/Foe", CV_SAVE, seenames_cons_t, 0);
-consvar_t cv_allowseenames = CVAR_INIT ("allowseenames", "Yes", CV_SAVE|CV_NETVAR, CV_YesNo, NULL);
+consvar_t cv_seenames = CVAR_INIT ("seenames", "Ally/Foe", CV_SAVE|CV_ALLOWLUA, seenames_cons_t, 0);
+consvar_t cv_allowseenames = CVAR_INIT ("allowseenames", "Yes", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_YesNo, NULL);
// names
consvar_t cv_playername = CVAR_INIT ("name", "Sonic", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Name_OnChange);
consvar_t cv_playername2 = CVAR_INIT ("name2", "Tails", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Name2_OnChange);
// player colors
UINT16 lastgoodcolor = SKINCOLOR_BLUE, lastgoodcolor2 = SKINCOLOR_BLUE;
-consvar_t cv_playercolor = CVAR_INIT ("color", "Blue", CV_CALL|CV_NOINIT, Color_cons_t, Color_OnChange);
-consvar_t cv_playercolor2 = CVAR_INIT ("color2", "Orange", CV_CALL|CV_NOINIT, Color_cons_t, Color2_OnChange);
+consvar_t cv_playercolor = CVAR_INIT ("color", "Blue", CV_CALL|CV_NOINIT|CV_ALLOWLUA, Color_cons_t, Color_OnChange);
+consvar_t cv_playercolor2 = CVAR_INIT ("color2", "Orange", CV_CALL|CV_NOINIT|CV_ALLOWLUA, Color_cons_t, Color2_OnChange);
// player's skin, saved for commodity, when using a favorite skins wad..
-consvar_t cv_skin = CVAR_INIT ("skin", DEFAULTSKIN, CV_CALL|CV_NOINIT, NULL, Skin_OnChange);
-consvar_t cv_skin2 = CVAR_INIT ("skin2", DEFAULTSKIN2, CV_CALL|CV_NOINIT, NULL, Skin2_OnChange);
+consvar_t cv_skin = CVAR_INIT ("skin", DEFAULTSKIN, CV_CALL|CV_NOINIT|CV_ALLOWLUA, NULL, Skin_OnChange);
+consvar_t cv_skin2 = CVAR_INIT ("skin2", DEFAULTSKIN2, CV_CALL|CV_NOINIT|CV_ALLOWLUA, NULL, Skin2_OnChange);
// saved versions of the above six
consvar_t cv_defaultplayercolor = CVAR_INIT ("defaultcolor", "Blue", CV_SAVE, Color_cons_t, NULL);
@@ -242,61 +250,19 @@ INT32 cv_debug;
consvar_t cv_usemouse = CVAR_INIT ("use_mouse", "On", CV_SAVE|CV_CALL,usemouse_cons_t, I_StartupMouse);
consvar_t cv_usemouse2 = CVAR_INIT ("use_mouse2", "Off", CV_SAVE|CV_CALL,usemouse_cons_t, I_StartupMouse2);
-// We use cv_usegamepad.string as the USER-SET var
-// and cv_usegamepad.value as the INTERNAL var
-//
-// In practice, if cv_usegamepad.string == 0, this overrides
-// cv_usegamepad.value and always disables
-
-static void UseGamepad_OnChange(void)
-{
- I_ChangeGamepad(0);
-}
-
-static void UseGamepad2_OnChange(void)
-{
- I_ChangeGamepad(1);
-}
-
-consvar_t cv_usegamepad[2] = {
- CVAR_INIT ("use_gamepad", "1", CV_SAVE|CV_CALL, NULL, UseGamepad_OnChange),
- CVAR_INIT ("use_gamepad2", "2", CV_SAVE|CV_CALL, NULL, UseGamepad2_OnChange)
-};
-
-static void PadScale_OnChange(void)
-{
- I_SetGamepadDigital(0, cv_gamepad_scale[0].value == 0);
-}
-
-static void PadScale2_OnChange(void)
-{
- I_SetGamepadDigital(1, cv_gamepad_scale[1].value == 0);
-}
-
-consvar_t cv_gamepad_scale[2] = {
- CVAR_INIT ("padscale", "1", CV_SAVE|CV_CALL, NULL, PadScale_OnChange),
- CVAR_INIT ("padscale2", "1", CV_SAVE|CV_CALL, NULL, PadScale2_OnChange)
-};
-
-static void PadRumble_OnChange(void)
-{
- if (!cv_gamepad_rumble[0].value)
- I_StopGamepadRumble(0);
-}
-
-static void PadRumble2_OnChange(void)
-{
- if (!cv_gamepad_rumble[1].value)
- I_StopGamepadRumble(1);
-}
-
-consvar_t cv_gamepad_rumble[2] = {
- CVAR_INIT ("padrumble", "Off", CV_SAVE|CV_CALL, CV_OnOff, PadRumble_OnChange),
- CVAR_INIT ("padrumble2", "Off", CV_SAVE|CV_CALL, CV_OnOff, PadRumble2_OnChange)
-};
-
-consvar_t cv_gamepad_autopause = CVAR_INIT ("pauseongamepaddisconnect", "On", CV_SAVE, CV_OnOff, NULL);
-
+consvar_t cv_usejoystick = CVAR_INIT ("use_gamepad", "1", CV_SAVE|CV_CALL, usejoystick_cons_t, I_InitJoystick);
+consvar_t cv_usejoystick2 = CVAR_INIT ("use_gamepad2", "2", CV_SAVE|CV_CALL, usejoystick_cons_t, I_InitJoystick2);
+#if (defined (LJOYSTICK) || defined (HAVE_SDL))
+#ifdef LJOYSTICK
+consvar_t cv_joyport = CVAR_INIT ("padport", "/dev/js0", CV_SAVE, joyport_cons_t, NULL);
+consvar_t cv_joyport2 = CVAR_INIT ("padport2", "/dev/js0", CV_SAVE, joyport_cons_t, NULL); //Alam: for later
+#endif
+consvar_t cv_joyscale = CVAR_INIT ("padscale", "1", CV_SAVE|CV_CALL, NULL, I_JoyScale);
+consvar_t cv_joyscale2 = CVAR_INIT ("padscale2", "1", CV_SAVE|CV_CALL, NULL, I_JoyScale2);
+#else
+consvar_t cv_joyscale = CVAR_INIT ("padscale", "1", CV_SAVE|CV_HIDEN, NULL, NULL); //Alam: Dummy for save
+consvar_t cv_joyscale2 = CVAR_INIT ("padscale2", "1", CV_SAVE|CV_HIDEN, NULL, NULL); //Alam: Dummy for save
+#endif
#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
consvar_t cv_mouse2port = CVAR_INIT ("mouse2port", "/dev/gpmdata", CV_SAVE, mouse2port_cons_t, NULL);
consvar_t cv_mouse2opt = CVAR_INIT ("mouse2opt", "0", CV_SAVE, NULL, NULL);
@@ -304,43 +270,43 @@ consvar_t cv_mouse2opt = CVAR_INIT ("mouse2opt", "0", CV_SAVE, NULL, NULL);
consvar_t cv_mouse2port = CVAR_INIT ("mouse2port", "COM2", CV_SAVE, mouse2port_cons_t, NULL);
#endif
-consvar_t cv_matchboxes = CVAR_INIT ("matchboxes", "Normal", CV_SAVE|CV_NETVAR|CV_CHEAT, matchboxes_cons_t, NULL);
-consvar_t cv_specialrings = CVAR_INIT ("specialrings", "On", CV_SAVE|CV_NETVAR, CV_OnOff, NULL);
-consvar_t cv_powerstones = CVAR_INIT ("powerstones", "On", CV_SAVE|CV_NETVAR, CV_OnOff, NULL);
-
-consvar_t cv_recycler = CVAR_INIT ("tv_recycler", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
-consvar_t cv_teleporters = CVAR_INIT ("tv_teleporter", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
-consvar_t cv_superring = CVAR_INIT ("tv_superring", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
-consvar_t cv_supersneakers = CVAR_INIT ("tv_supersneaker", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
-consvar_t cv_invincibility = CVAR_INIT ("tv_invincibility", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
-consvar_t cv_jumpshield = CVAR_INIT ("tv_jumpshield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
-consvar_t cv_watershield = CVAR_INIT ("tv_watershield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
-consvar_t cv_ringshield = CVAR_INIT ("tv_ringshield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
-consvar_t cv_forceshield = CVAR_INIT ("tv_forceshield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
-consvar_t cv_bombshield = CVAR_INIT ("tv_bombshield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
-consvar_t cv_1up = CVAR_INIT ("tv_1up", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
-consvar_t cv_eggmanbox = CVAR_INIT ("tv_eggman", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
-
-consvar_t cv_ringslinger = CVAR_INIT ("ringslinger", "No", CV_NETVAR|CV_NOSHOWHELP|CV_CALL|CV_CHEAT, CV_YesNo, Ringslinger_OnChange);
-consvar_t cv_gravity = CVAR_INIT ("gravity", "0.5", CV_RESTRICT|CV_FLOAT|CV_CALL, NULL, Gravity_OnChange);
+consvar_t cv_matchboxes = CVAR_INIT ("matchboxes", "Normal", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, matchboxes_cons_t, NULL);
+consvar_t cv_specialrings = CVAR_INIT ("specialrings", "On", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_OnOff, NULL);
+consvar_t cv_powerstones = CVAR_INIT ("powerstones", "On", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_OnOff, NULL);
+
+consvar_t cv_recycler = CVAR_INIT ("tv_recycler", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
+consvar_t cv_teleporters = CVAR_INIT ("tv_teleporter", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
+consvar_t cv_superring = CVAR_INIT ("tv_superring", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
+consvar_t cv_supersneakers = CVAR_INIT ("tv_supersneaker", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
+consvar_t cv_invincibility = CVAR_INIT ("tv_invincibility", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
+consvar_t cv_jumpshield = CVAR_INIT ("tv_jumpshield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
+consvar_t cv_watershield = CVAR_INIT ("tv_watershield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
+consvar_t cv_ringshield = CVAR_INIT ("tv_ringshield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
+consvar_t cv_forceshield = CVAR_INIT ("tv_forceshield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
+consvar_t cv_bombshield = CVAR_INIT ("tv_bombshield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
+consvar_t cv_1up = CVAR_INIT ("tv_1up", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
+consvar_t cv_eggmanbox = CVAR_INIT ("tv_eggman", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL);
+
+consvar_t cv_ringslinger = CVAR_INIT ("ringslinger", "No", CV_NETVAR|CV_NOSHOWHELP|CV_CALL|CV_CHEAT|CV_ALLOWLUA, CV_YesNo, Ringslinger_OnChange);
+consvar_t cv_gravity = CVAR_INIT ("gravity", "0.5", CV_RESTRICT|CV_FLOAT|CV_CALL|CV_ALLOWLUA, NULL, Gravity_OnChange);
consvar_t cv_soundtest = CVAR_INIT ("soundtest", "0", CV_CALL, NULL, SoundTest_OnChange);
static CV_PossibleValue_t minitimelimit_cons_t[] = {{1, "MIN"}, {9999, "MAX"}, {0, NULL}};
-consvar_t cv_countdowntime = CVAR_INIT ("countdowntime", "60", CV_SAVE|CV_NETVAR|CV_CHEAT, minitimelimit_cons_t, NULL);
+consvar_t cv_countdowntime = CVAR_INIT ("countdowntime", "60", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, minitimelimit_cons_t, NULL);
-consvar_t cv_touchtag = CVAR_INIT ("touchtag", "Off", CV_SAVE|CV_NETVAR, CV_OnOff, NULL);
-consvar_t cv_hidetime = CVAR_INIT ("hidetime", "30", CV_SAVE|CV_NETVAR|CV_CALL, minitimelimit_cons_t, Hidetime_OnChange);
+consvar_t cv_touchtag = CVAR_INIT ("touchtag", "Off", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_OnOff, NULL);
+consvar_t cv_hidetime = CVAR_INIT ("hidetime", "30", CV_SAVE|CV_NETVAR|CV_CALL|CV_ALLOWLUA, minitimelimit_cons_t, Hidetime_OnChange);
-consvar_t cv_autobalance = CVAR_INIT ("autobalance", "Off", CV_SAVE|CV_NETVAR|CV_CALL, CV_OnOff, AutoBalance_OnChange);
-consvar_t cv_teamscramble = CVAR_INIT ("teamscramble", "Off", CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT, teamscramble_cons_t, TeamScramble_OnChange);
-consvar_t cv_scrambleonchange = CVAR_INIT ("scrambleonchange", "Off", CV_SAVE|CV_NETVAR, teamscramble_cons_t, NULL);
+consvar_t cv_autobalance = CVAR_INIT ("autobalance", "Off", CV_SAVE|CV_NETVAR|CV_CALL|CV_ALLOWLUA, CV_OnOff, AutoBalance_OnChange);
+consvar_t cv_teamscramble = CVAR_INIT ("teamscramble", "Off", CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT|CV_ALLOWLUA, teamscramble_cons_t, TeamScramble_OnChange);
+consvar_t cv_scrambleonchange = CVAR_INIT ("scrambleonchange", "Off", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, teamscramble_cons_t, NULL);
-consvar_t cv_friendlyfire = CVAR_INIT ("friendlyfire", "Off", CV_SAVE|CV_NETVAR, CV_OnOff, NULL);
-consvar_t cv_itemfinder = CVAR_INIT ("itemfinder", "Off", CV_CALL, CV_OnOff, ItemFinder_OnChange);
+consvar_t cv_friendlyfire = CVAR_INIT ("friendlyfire", "Off", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_OnOff, NULL);
+consvar_t cv_itemfinder = CVAR_INIT ("itemfinder", "Off", CV_CALL|CV_ALLOWLUA, CV_OnOff, ItemFinder_OnChange);
// Scoring type options
-consvar_t cv_overtime = CVAR_INIT ("overtime", "Yes", CV_SAVE|CV_NETVAR, CV_YesNo, NULL);
+consvar_t cv_overtime = CVAR_INIT ("overtime", "Yes", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_YesNo, NULL);
consvar_t cv_rollingdemos = CVAR_INIT ("rollingdemos", "On", CV_SAVE, CV_OnOff, NULL);
@@ -351,13 +317,13 @@ static CV_PossibleValue_t powerupdisplay_cons_t[] = {{0, "Never"}, {1, "First-pe
consvar_t cv_powerupdisplay = CVAR_INIT ("powerupdisplay", "First-person only", CV_SAVE, powerupdisplay_cons_t, NULL);
static CV_PossibleValue_t pointlimit_cons_t[] = {{1, "MIN"}, {MAXSCORE, "MAX"}, {0, "None"}, {0, NULL}};
-consvar_t cv_pointlimit = CVAR_INIT ("pointlimit", "None", CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT, pointlimit_cons_t, PointLimit_OnChange);
+consvar_t cv_pointlimit = CVAR_INIT ("pointlimit", "None", CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT|CV_ALLOWLUA, pointlimit_cons_t, PointLimit_OnChange);
static CV_PossibleValue_t timelimit_cons_t[] = {{1, "MIN"}, {30, "MAX"}, {0, "None"}, {0, NULL}};
-consvar_t cv_timelimit = CVAR_INIT ("timelimit", "None", CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT, timelimit_cons_t, TimeLimit_OnChange);
+consvar_t cv_timelimit = CVAR_INIT ("timelimit", "None", CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT|CV_ALLOWLUA, timelimit_cons_t, TimeLimit_OnChange);
static CV_PossibleValue_t numlaps_cons_t[] = {{1, "MIN"}, {50, "MAX"}, {0, NULL}};
-consvar_t cv_numlaps = CVAR_INIT ("numlaps", "4", CV_NETVAR|CV_CALL|CV_NOINIT, numlaps_cons_t, NumLaps_OnChange);
+consvar_t cv_numlaps = CVAR_INIT ("numlaps", "4", CV_NETVAR|CV_CALL|CV_NOINIT|CV_ALLOWLUA, numlaps_cons_t, NumLaps_OnChange);
static CV_PossibleValue_t basenumlaps_cons_t[] = {{1, "MIN"}, {50, "MAX"}, {0, "Map default"}, {0, NULL}};
-consvar_t cv_basenumlaps = CVAR_INIT ("basenumlaps", "Map default", CV_SAVE|CV_NETVAR|CV_CALL|CV_CHEAT, basenumlaps_cons_t, BaseNumLaps_OnChange);
+consvar_t cv_basenumlaps = CVAR_INIT ("basenumlaps", "Map default", CV_SAVE|CV_NETVAR|CV_CALL|CV_CHEAT|CV_ALLOWLUA, basenumlaps_cons_t, BaseNumLaps_OnChange);
// Point and time limits for every gametype
INT32 pointlimits[NUMGAMETYPES];
@@ -366,11 +332,11 @@ INT32 timelimits[NUMGAMETYPES];
// log elemental hazards -- not a netvar, is local to current player
consvar_t cv_hazardlog = CVAR_INIT ("hazardlog", "Yes", 0, CV_YesNo, NULL);
-consvar_t cv_forceskin = CVAR_INIT ("forceskin", "None", CV_NETVAR|CV_CALL|CV_CHEAT, NULL, ForceSkin_OnChange);
+consvar_t cv_forceskin = CVAR_INIT ("forceskin", "None", CV_NETVAR|CV_CALL|CV_CHEAT|CV_ALLOWLUA, NULL, ForceSkin_OnChange);
consvar_t cv_downloading = CVAR_INIT ("downloading", "On", 0, CV_OnOff, NULL);
-consvar_t cv_allowexitlevel = CVAR_INIT ("allowexitlevel", "No", CV_SAVE|CV_NETVAR, CV_YesNo, NULL);
+consvar_t cv_allowexitlevel = CVAR_INIT ("allowexitlevel", "No", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_YesNo, NULL);
-consvar_t cv_killingdead = CVAR_INIT ("killingdead", "Off", CV_NETVAR, CV_OnOff, NULL);
+consvar_t cv_killingdead = CVAR_INIT ("killingdead", "Off", CV_NETVAR|CV_ALLOWLUA, CV_OnOff, NULL);
consvar_t cv_netstat = CVAR_INIT ("netstat", "Off", 0, CV_OnOff, NULL); // show bandwidth statistics
static CV_PossibleValue_t nettimeout_cons_t[] = {{TICRATE/7, "MIN"}, {60*TICRATE, "MAX"}, {0, NULL}};
@@ -388,26 +354,26 @@ consvar_t cv_showping = CVAR_INIT ("showping", "Warning", CV_SAVE, showping_cons
// Intermission time Tails 04-19-2002
static CV_PossibleValue_t inttime_cons_t[] = {{0, "MIN"}, {3600, "MAX"}, {0, NULL}};
-consvar_t cv_inttime = CVAR_INIT ("inttime", "10", CV_SAVE|CV_NETVAR, inttime_cons_t, NULL);
+consvar_t cv_inttime = CVAR_INIT ("inttime", "10", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, inttime_cons_t, NULL);
static CV_PossibleValue_t coopstarposts_cons_t[] = {{0, "Per-player"}, {1, "Shared"}, {2, "Teamwork"}, {0, NULL}};
-consvar_t cv_coopstarposts = CVAR_INIT ("coopstarposts", "Per-player", CV_SAVE|CV_NETVAR|CV_CALL, coopstarposts_cons_t, CoopStarposts_OnChange);
+consvar_t cv_coopstarposts = CVAR_INIT ("coopstarposts", "Per-player", CV_SAVE|CV_NETVAR|CV_CALL|CV_ALLOWLUA, coopstarposts_cons_t, CoopStarposts_OnChange);
static CV_PossibleValue_t cooplives_cons_t[] = {{0, "Infinite"}, {1, "Per-player"}, {2, "Avoid Game Over"}, {3, "Single pool"}, {0, NULL}};
-consvar_t cv_cooplives = CVAR_INIT ("cooplives", "Avoid Game Over", CV_SAVE|CV_NETVAR|CV_CALL|CV_CHEAT, cooplives_cons_t, CoopLives_OnChange);
+consvar_t cv_cooplives = CVAR_INIT ("cooplives", "Avoid Game Over", CV_SAVE|CV_NETVAR|CV_CALL|CV_CHEAT|CV_ALLOWLUA, cooplives_cons_t, CoopLives_OnChange);
static CV_PossibleValue_t advancemap_cons_t[] = {{0, "Off"}, {1, "Next"}, {2, "Random"}, {0, NULL}};
-consvar_t cv_advancemap = CVAR_INIT ("advancemap", "Next", CV_SAVE|CV_NETVAR, advancemap_cons_t, NULL);
+consvar_t cv_advancemap = CVAR_INIT ("advancemap", "Next", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, advancemap_cons_t, NULL);
static CV_PossibleValue_t playersforexit_cons_t[] = {{0, "One"}, {1, "1/4"}, {2, "Half"}, {3, "3/4"}, {4, "All"}, {0, NULL}};
-consvar_t cv_playersforexit = CVAR_INIT ("playersforexit", "All", CV_SAVE|CV_NETVAR, playersforexit_cons_t, NULL);
+consvar_t cv_playersforexit = CVAR_INIT ("playersforexit", "All", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, playersforexit_cons_t, NULL);
-consvar_t cv_exitmove = CVAR_INIT ("exitmove", "On", CV_SAVE|CV_NETVAR|CV_CALL, CV_OnOff, ExitMove_OnChange);
+consvar_t cv_exitmove = CVAR_INIT ("exitmove", "On", CV_SAVE|CV_NETVAR|CV_CALL|CV_ALLOWLUA, CV_OnOff, ExitMove_OnChange);
-consvar_t cv_runscripts = CVAR_INIT ("runscripts", "Yes", 0, CV_YesNo, NULL);
+consvar_t cv_runscripts = CVAR_INIT ("runscripts", "Yes", CV_ALLOWLUA, CV_YesNo, NULL);
-consvar_t cv_pause = CVAR_INIT ("pausepermission", "Server", CV_SAVE|CV_NETVAR, pause_cons_t, NULL);
-consvar_t cv_mute = CVAR_INIT ("mute", "Off", CV_NETVAR|CV_CALL, CV_OnOff, Mute_OnChange);
+consvar_t cv_pause = CVAR_INIT ("pausepermission", "Server", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, pause_cons_t, NULL);
+consvar_t cv_mute = CVAR_INIT ("mute", "Off", CV_NETVAR|CV_CALL|CV_ALLOWLUA, CV_OnOff, Mute_OnChange);
consvar_t cv_sleep = CVAR_INIT ("cpusleep", "1", CV_SAVE, sleeping_cons_t, NULL);
@@ -500,57 +466,57 @@ void D_RegisterServerCommands(void)
RegisterNetXCmd(XD_LUAFILE, Got_LuaFile);
// Remote Administration
- COM_AddCommand("password", Command_Changepassword_f);
- COM_AddCommand("login", Command_Login_f); // useful in dedicated to kick off remote admin
- COM_AddCommand("promote", Command_Verify_f);
+ COM_AddCommand("password", Command_Changepassword_f, COM_LUA);
+ COM_AddCommand("login", Command_Login_f, COM_LUA); // useful in dedicated to kick off remote admin
+ COM_AddCommand("promote", Command_Verify_f, COM_LUA);
RegisterNetXCmd(XD_VERIFIED, Got_Verification);
- COM_AddCommand("demote", Command_RemoveAdmin_f);
+ COM_AddCommand("demote", Command_RemoveAdmin_f, COM_LUA);
RegisterNetXCmd(XD_DEMOTED, Got_Removal);
- COM_AddCommand("motd", Command_MotD_f);
+ COM_AddCommand("motd", Command_MotD_f, COM_LUA);
RegisterNetXCmd(XD_SETMOTD, Got_MotD_f); // For remote admin
RegisterNetXCmd(XD_TEAMCHANGE, Got_Teamchange);
- COM_AddCommand("serverchangeteam", Command_ServerTeamChange_f);
+ COM_AddCommand("serverchangeteam", Command_ServerTeamChange_f, COM_LUA);
RegisterNetXCmd(XD_CLEARSCORES, Got_Clearscores);
- COM_AddCommand("clearscores", Command_Clearscores_f);
- COM_AddCommand("map", Command_Map_f);
+ COM_AddCommand("clearscores", Command_Clearscores_f, COM_LUA);
+ COM_AddCommand("map", Command_Map_f, COM_LUA);
- COM_AddCommand("exitgame", Command_ExitGame_f);
- COM_AddCommand("retry", Command_Retry_f);
- COM_AddCommand("exitlevel", Command_ExitLevel_f);
- COM_AddCommand("showmap", Command_Showmap_f);
- COM_AddCommand("mapmd5", Command_Mapmd5_f);
+ COM_AddCommand("exitgame", Command_ExitGame_f, COM_LUA);
+ COM_AddCommand("retry", Command_Retry_f, COM_LUA);
+ COM_AddCommand("exitlevel", Command_ExitLevel_f, COM_LUA);
+ COM_AddCommand("showmap", Command_Showmap_f, COM_LUA);
+ COM_AddCommand("mapmd5", Command_Mapmd5_f, COM_LUA);
- COM_AddCommand("addfolder", Command_Addfolder);
- COM_AddCommand("addfile", Command_Addfile);
- COM_AddCommand("listwad", Command_ListWADS_f);
+ COM_AddCommand("addfolder", Command_Addfolder, COM_LUA);
+ COM_AddCommand("addfile", Command_Addfile, COM_LUA);
+ COM_AddCommand("listwad", Command_ListWADS_f, COM_LUA);
- COM_AddCommand("runsoc", Command_RunSOC);
- COM_AddCommand("pause", Command_Pause);
- COM_AddCommand("suicide", Command_Suicide);
+ COM_AddCommand("runsoc", Command_RunSOC, COM_LUA);
+ COM_AddCommand("pause", Command_Pause, COM_LUA);
+ COM_AddCommand("suicide", Command_Suicide, COM_LUA);
- COM_AddCommand("gametype", Command_ShowGametype_f);
- COM_AddCommand("version", Command_Version_f);
+ COM_AddCommand("gametype", Command_ShowGametype_f, COM_LUA);
+ COM_AddCommand("version", Command_Version_f, COM_LUA);
#ifdef UPDATE_ALERT
- COM_AddCommand("mod_details", Command_ModDetails_f);
+ COM_AddCommand("mod_details", Command_ModDetails_f, COM_LUA);
#endif
- COM_AddCommand("quit", Command_Quit_f);
-
- COM_AddCommand("saveconfig", Command_SaveConfig_f);
- COM_AddCommand("loadconfig", Command_LoadConfig_f);
- COM_AddCommand("changeconfig", Command_ChangeConfig_f);
- COM_AddCommand("isgamemodified", Command_Isgamemodified_f); // test
- COM_AddCommand("showscores", Command_ShowScores_f);
- COM_AddCommand("showtime", Command_ShowTime_f);
- COM_AddCommand("cheats", Command_Cheats_f); // test
+ COM_AddCommand("quit", Command_Quit_f, COM_LUA);
+
+ COM_AddCommand("saveconfig", Command_SaveConfig_f, 0);
+ COM_AddCommand("loadconfig", Command_LoadConfig_f, 0);
+ COM_AddCommand("changeconfig", Command_ChangeConfig_f, 0);
+ COM_AddCommand("isgamemodified", Command_Isgamemodified_f, COM_LUA); // test
+ COM_AddCommand("showscores", Command_ShowScores_f, COM_LUA);
+ COM_AddCommand("showtime", Command_ShowTime_f, COM_LUA);
+ COM_AddCommand("cheats", Command_Cheats_f, COM_LUA); // test
#ifdef _DEBUG
- COM_AddCommand("togglemodified", Command_Togglemodified_f);
- COM_AddCommand("archivetest", Command_Archivetest_f);
+ COM_AddCommand("togglemodified", Command_Togglemodified_f, COM_LUA);
+ COM_AddCommand("archivetest", Command_Archivetest_f, COM_LUA);
#endif
- COM_AddCommand("downloads", Command_Downloads_f);
+ COM_AddCommand("downloads", Command_Downloads_f, COM_LUA);
// for master server connection
AddMServCommands();
@@ -633,8 +599,9 @@ void D_RegisterServerCommands(void)
CV_RegisterVar(&cv_allownewplayer);
CV_RegisterVar(&cv_showjoinaddress);
CV_RegisterVar(&cv_blamecfail);
+ CV_RegisterVar(&cv_dedicatedidletime);
- COM_AddCommand("ping", Command_Ping_f);
+ COM_AddCommand("ping", Command_Ping_f, COM_LUA);
CV_RegisterVar(&cv_nettimeout);
CV_RegisterVar(&cv_jointimeout);
@@ -646,6 +613,10 @@ void D_RegisterServerCommands(void)
CV_RegisterVar(&cv_allowseenames);
+ // Other filesrch.c consvars are defined in D_RegisterClientCommands
+ CV_RegisterVar(&cv_addons_option);
+ CV_RegisterVar(&cv_addons_folder);
+
CV_RegisterVar(&cv_dummyconsvar);
}
@@ -678,25 +649,25 @@ void D_RegisterClientCommands(void)
if (dedicated)
return;
- COM_AddCommand("numthinkers", Command_Numthinkers_f);
- COM_AddCommand("countmobjs", Command_CountMobjs_f);
+ COM_AddCommand("numthinkers", Command_Numthinkers_f, COM_LUA);
+ COM_AddCommand("countmobjs", Command_CountMobjs_f, COM_LUA);
- COM_AddCommand("changeteam", Command_Teamchange_f);
- COM_AddCommand("changeteam2", Command_Teamchange2_f);
+ COM_AddCommand("changeteam", Command_Teamchange_f, COM_LUA);
+ COM_AddCommand("changeteam2", Command_Teamchange2_f, COM_LUA);
- COM_AddCommand("playdemo", Command_Playdemo_f);
- COM_AddCommand("timedemo", Command_Timedemo_f);
- COM_AddCommand("stopdemo", Command_Stopdemo_f);
- COM_AddCommand("playintro", Command_Playintro_f);
+ COM_AddCommand("playdemo", Command_Playdemo_f, 0);
+ COM_AddCommand("timedemo", Command_Timedemo_f, 0);
+ COM_AddCommand("stopdemo", Command_Stopdemo_f, COM_LUA);
+ COM_AddCommand("playintro", Command_Playintro_f, COM_LUA);
- COM_AddCommand("resetcamera", Command_ResetCamera_f);
+ COM_AddCommand("resetcamera", Command_ResetCamera_f, COM_LUA);
- COM_AddCommand("setcontrol", Command_Setcontrol_f);
- COM_AddCommand("setcontrol2", Command_Setcontrol2_f);
+ COM_AddCommand("setcontrol", Command_Setcontrol_f, 0);
+ COM_AddCommand("setcontrol2", Command_Setcontrol2_f, 0);
- COM_AddCommand("screenshot", M_ScreenShot);
- COM_AddCommand("startmovie", Command_StartMovie_f);
- COM_AddCommand("stopmovie", Command_StopMovie_f);
+ COM_AddCommand("screenshot", M_ScreenShot, COM_LUA);
+ COM_AddCommand("startmovie", Command_StartMovie_f, COM_LUA);
+ COM_AddCommand("stopmovie", Command_StopMovie_f, COM_LUA);
CV_RegisterVar(&cv_screenshot_option);
CV_RegisterVar(&cv_screenshot_folder);
@@ -758,7 +729,7 @@ void D_RegisterClientCommands(void)
CV_RegisterVar(&cv_ghost_last);
CV_RegisterVar(&cv_ghost_guest);
- COM_AddCommand("displayplayer", Command_Displayplayer_f);
+ COM_AddCommand("displayplayer", Command_Displayplayer_f, COM_LUA);
// FIXME: not to be here.. but needs be done for config loading
CV_RegisterVar(&cv_globalgamma);
@@ -805,30 +776,30 @@ void D_RegisterClientCommands(void)
CV_RegisterVar(&cv_pauseifunfocused);
// g_input.c
- CV_RegisterVar(&cv_sideaxis[0]);
- CV_RegisterVar(&cv_sideaxis[1]);
- CV_RegisterVar(&cv_turnaxis[0]);
- CV_RegisterVar(&cv_turnaxis[1]);
- CV_RegisterVar(&cv_moveaxis[0]);
- CV_RegisterVar(&cv_moveaxis[1]);
- CV_RegisterVar(&cv_lookaxis[0]);
- CV_RegisterVar(&cv_lookaxis[1]);
- CV_RegisterVar(&cv_jumpaxis[0]);
- CV_RegisterVar(&cv_jumpaxis[1]);
- CV_RegisterVar(&cv_spinaxis[0]);
- CV_RegisterVar(&cv_spinaxis[1]);
- CV_RegisterVar(&cv_fireaxis[0]);
- CV_RegisterVar(&cv_fireaxis[1]);
- CV_RegisterVar(&cv_firenaxis[0]);
- CV_RegisterVar(&cv_firenaxis[1]);
- CV_RegisterVar(&cv_deadzone[0]);
- CV_RegisterVar(&cv_deadzone[1]);
- CV_RegisterVar(&cv_digitaldeadzone[0]);
- CV_RegisterVar(&cv_digitaldeadzone[1]);
+ CV_RegisterVar(&cv_sideaxis);
+ CV_RegisterVar(&cv_sideaxis2);
+ CV_RegisterVar(&cv_turnaxis);
+ CV_RegisterVar(&cv_turnaxis2);
+ CV_RegisterVar(&cv_moveaxis);
+ CV_RegisterVar(&cv_moveaxis2);
+ CV_RegisterVar(&cv_lookaxis);
+ CV_RegisterVar(&cv_lookaxis2);
+ CV_RegisterVar(&cv_jumpaxis);
+ CV_RegisterVar(&cv_jumpaxis2);
+ CV_RegisterVar(&cv_spinaxis);
+ CV_RegisterVar(&cv_spinaxis2);
+ CV_RegisterVar(&cv_fireaxis);
+ CV_RegisterVar(&cv_fireaxis2);
+ CV_RegisterVar(&cv_firenaxis);
+ CV_RegisterVar(&cv_firenaxis2);
+ CV_RegisterVar(&cv_deadzone);
+ CV_RegisterVar(&cv_deadzone2);
+ CV_RegisterVar(&cv_digitaldeadzone);
+ CV_RegisterVar(&cv_digitaldeadzone2);
// filesrch.c
- CV_RegisterVar(&cv_addons_option);
- CV_RegisterVar(&cv_addons_folder);
+ //CV_RegisterVar(&cv_addons_option); // These two are now defined
+ //CV_RegisterVar(&cv_addons_folder); // in D_RegisterServerCommands
CV_RegisterVar(&cv_addons_md5);
CV_RegisterVar(&cv_addons_showall);
CV_RegisterVar(&cv_addons_search_type);
@@ -853,14 +824,14 @@ void D_RegisterClientCommands(void)
CV_RegisterVar(&cv_mousemove);
CV_RegisterVar(&cv_mousemove2);
- for (i = 0; i < 2; i++)
- {
- CV_RegisterVar(&cv_usegamepad[i]);
- CV_RegisterVar(&cv_gamepad_scale[i]);
- CV_RegisterVar(&cv_gamepad_rumble[i]);
- }
-
- CV_RegisterVar(&cv_gamepad_autopause);
+ CV_RegisterVar(&cv_usejoystick);
+ CV_RegisterVar(&cv_usejoystick2);
+#ifdef LJOYSTICK
+ CV_RegisterVar(&cv_joyport);
+ CV_RegisterVar(&cv_joyport2);
+#endif
+ CV_RegisterVar(&cv_joyscale);
+ CV_RegisterVar(&cv_joyscale2);
// Analog Control
CV_RegisterVar(&cv_analog[0]);
@@ -902,10 +873,15 @@ void D_RegisterClientCommands(void)
// screen.c
CV_RegisterVar(&cv_fullscreen);
CV_RegisterVar(&cv_renderview);
+ CV_RegisterVar(&cv_renderhitboxinterpolation);
+ CV_RegisterVar(&cv_renderhitboxgldepth);
+ CV_RegisterVar(&cv_renderhitbox);
CV_RegisterVar(&cv_renderer);
CV_RegisterVar(&cv_scr_depth);
CV_RegisterVar(&cv_scr_width);
CV_RegisterVar(&cv_scr_height);
+ CV_RegisterVar(&cv_scr_width_w);
+ CV_RegisterVar(&cv_scr_height_w);
CV_RegisterVar(&cv_soundtest);
@@ -914,7 +890,7 @@ void D_RegisterClientCommands(void)
CV_RegisterVar(&cv_ps_descriptor);
// ingame object placing
- COM_AddCommand("objectplace", Command_ObjectPlace_f);
+ COM_AddCommand("objectplace", Command_ObjectPlace_f, COM_LUA);
//COM_AddCommand("writethings", Command_Writethings_f);
CV_RegisterVar(&cv_speed);
CV_RegisterVar(&cv_opflags);
@@ -926,32 +902,32 @@ void D_RegisterClientCommands(void)
CV_RegisterVar(&cv_freedemocamera);
// add cheat commands
- COM_AddCommand("noclip", Command_CheatNoClip_f);
- COM_AddCommand("god", Command_CheatGod_f);
- COM_AddCommand("notarget", Command_CheatNoTarget_f);
- COM_AddCommand("getallemeralds", Command_Getallemeralds_f);
- COM_AddCommand("resetemeralds", Command_Resetemeralds_f);
- COM_AddCommand("setrings", Command_Setrings_f);
- COM_AddCommand("setlives", Command_Setlives_f);
- COM_AddCommand("setcontinues", Command_Setcontinues_f);
- COM_AddCommand("devmode", Command_Devmode_f);
- COM_AddCommand("savecheckpoint", Command_Savecheckpoint_f);
- COM_AddCommand("scale", Command_Scale_f);
- COM_AddCommand("gravflip", Command_Gravflip_f);
- COM_AddCommand("hurtme", Command_Hurtme_f);
- COM_AddCommand("jumptoaxis", Command_JumpToAxis_f);
- COM_AddCommand("charability", Command_Charability_f);
- COM_AddCommand("charspeed", Command_Charspeed_f);
- COM_AddCommand("teleport", Command_Teleport_f);
- COM_AddCommand("rteleport", Command_RTeleport_f);
- COM_AddCommand("skynum", Command_Skynum_f);
- COM_AddCommand("weather", Command_Weather_f);
- COM_AddCommand("toggletwod", Command_Toggletwod_f);
+ COM_AddCommand("noclip", Command_CheatNoClip_f, COM_LUA);
+ COM_AddCommand("god", Command_CheatGod_f, COM_LUA);
+ COM_AddCommand("notarget", Command_CheatNoTarget_f, COM_LUA);
+ COM_AddCommand("getallemeralds", Command_Getallemeralds_f, COM_LUA);
+ COM_AddCommand("resetemeralds", Command_Resetemeralds_f, COM_LUA);
+ COM_AddCommand("setrings", Command_Setrings_f, COM_LUA);
+ COM_AddCommand("setlives", Command_Setlives_f, COM_LUA);
+ COM_AddCommand("setcontinues", Command_Setcontinues_f, COM_LUA);
+ COM_AddCommand("devmode", Command_Devmode_f, COM_LUA);
+ COM_AddCommand("savecheckpoint", Command_Savecheckpoint_f, COM_LUA);
+ COM_AddCommand("scale", Command_Scale_f, COM_LUA);
+ COM_AddCommand("gravflip", Command_Gravflip_f, COM_LUA);
+ COM_AddCommand("hurtme", Command_Hurtme_f, COM_LUA);
+ COM_AddCommand("jumptoaxis", Command_JumpToAxis_f, COM_LUA);
+ COM_AddCommand("charability", Command_Charability_f, COM_LUA);
+ COM_AddCommand("charspeed", Command_Charspeed_f, COM_LUA);
+ COM_AddCommand("teleport", Command_Teleport_f, COM_LUA);
+ COM_AddCommand("rteleport", Command_RTeleport_f, COM_LUA);
+ COM_AddCommand("skynum", Command_Skynum_f, COM_LUA);
+ COM_AddCommand("weather", Command_Weather_f, COM_LUA);
+ COM_AddCommand("toggletwod", Command_Toggletwod_f, COM_LUA);
#ifdef _DEBUG
- COM_AddCommand("causecfail", Command_CauseCfail_f);
+ COM_AddCommand("causecfail", Command_CauseCfail_f, COM_LUA);
#endif
#ifdef LUA_ALLOW_BYTECODE
- COM_AddCommand("dumplua", Command_Dumplua_f);
+ COM_AddCommand("dumplua", Command_Dumplua_f, COM_LUA);
#endif
}
@@ -1666,9 +1642,14 @@ static void Command_Playdemo_f(void)
{
char name[256];
- if (COM_Argc() != 2)
+ if (COM_Argc() < 2)
{
- CONS_Printf(M_GetText("playdemo <demoname>: playback a demo\n"));
+ CONS_Printf("playdemo <demoname> [-addfiles / -force]:\n");
+ CONS_Printf(M_GetText(
+ "Play back a demo file. The full path from your SRB2 directory must be given.\n\n"
+
+ "* With \"-addfiles\", any required files are added from a list contained within the demo file.\n"
+ "* With \"-force\", the demo is played even if the necessary files have not been added.\n"));
return;
}
@@ -1690,6 +1671,16 @@ static void Command_Playdemo_f(void)
CONS_Printf(M_GetText("Playing back demo '%s'.\n"), name);
+ demofileoverride = DFILE_OVERRIDE_NONE;
+ if (strcmp(COM_Argv(2), "-addfiles") == 0)
+ {
+ demofileoverride = DFILE_OVERRIDE_LOAD;
+ }
+ else if (strcmp(COM_Argv(2), "-force") == 0)
+ {
+ demofileoverride = DFILE_OVERRIDE_SKIP;
+ }
+
// Internal if no extension, external if one exists
// If external, convert the file name to a path in SRB2's home directory
if (FIL_CheckExtension(name))
@@ -1910,7 +1901,7 @@ static void Command_Map_f(void)
const char *gametypename;
boolean newresetplayers;
- boolean mustmodifygame;
+ boolean wouldSetCheats;
INT32 newmapnum;
@@ -1931,11 +1922,11 @@ static void Command_Map_f(void)
option_gametype = COM_CheckPartialParm("-g");
newresetplayers = ! COM_CheckParm("-noresetplayers");
- mustmodifygame =
- !( netgame || multiplayer ) &&
- (!modifiedgame || savemoddata );
+ wouldSetCheats =
+ !( netgame || multiplayer ) &&
+ !( usedCheats );
- if (mustmodifygame && !option_force)
+ if (wouldSetCheats && !option_force)
{
/* May want to be more descriptive? */
CONS_Printf(M_GetText("Sorry, level change disabled in single player.\n"));
@@ -1989,9 +1980,9 @@ static void Command_Map_f(void)
return;
}
- if (mustmodifygame && option_force)
+ if (wouldSetCheats && option_force)
{
- G_SetGameModified(false);
+ G_SetUsedCheats(false);
}
// new gametype value
@@ -2064,7 +2055,7 @@ static void Command_Map_f(void)
// ... unless you're in a dedicated server. Yes, technically this means you can view any level by
// running a dedicated server and joining it yourself, but that's better than making dedicated server's
// lives hell.
- if (!dedicated && M_MapLocked(newmapnum))
+ if (!dedicated && M_MapLocked(newmapnum, serverGamedata))
{
CONS_Alert(CONS_NOTICE, M_GetText("You need to unlock this level before you can warp to it!\n"));
Z_Free(realmapname);
@@ -2199,7 +2190,7 @@ static void Command_Pause(void)
if (cv_pause.value || server || (IsPlayerAdmin(consoleplayer)))
{
- if (modeattacking || !(gamestate == GS_LEVEL || gamestate == GS_INTERMISSION) || (marathonmode && gamestate == GS_INTERMISSION))
+ if (modeattacking || !(gamestate == GS_LEVEL || gamestate == GS_INTERMISSION || gamestate == GS_WAITINGPLAYERS) || (marathonmode && gamestate == GS_INTERMISSION))
{
CONS_Printf(M_GetText("You can't pause here.\n"));
return;
@@ -2248,14 +2239,9 @@ static void Got_Pause(UINT8 **cp, INT32 playernum)
{
if (!menuactive || netgame)
S_PauseAudio();
-
- P_PauseRumble(NULL);
}
else
- {
S_ResumeAudio();
- P_UnpauseRumble(NULL);
- }
}
I_UpdateMouseGrab();
@@ -2367,7 +2353,7 @@ static void Got_Clearscores(UINT8 **cp, INT32 playernum)
}
for (i = 0; i < MAXPLAYERS; i++)
- players[i].score = 0;
+ players[i].score = players[i].recordscore = 0;
CONS_Printf(M_GetText("Scores have been reset by the server.\n"));
}
@@ -3310,6 +3296,69 @@ static void Got_RunSOCcmd(UINT8 **cp, INT32 playernum)
G_SetGameModified(true);
}
+// C++ would make this SO much simpler!
+typedef struct addedfile_s
+{
+ struct addedfile_s *next;
+ struct addedfile_s *prev;
+ char *value;
+} addedfile_t;
+
+static boolean AddedFileContains(addedfile_t *list, const char *value)
+{
+ addedfile_t *node;
+ for (node = list; node; node = node->next)
+ {
+ if (!strcmp(value, node->value))
+ return true;
+ }
+
+ return false;
+}
+
+static void AddedFilesAdd(addedfile_t **list, const char *value)
+{
+ addedfile_t *item = Z_Calloc(sizeof(addedfile_t), PU_STATIC, NULL);
+ item->value = Z_StrDup(value);
+ ListAdd(item, (listitem_t**)list);
+}
+
+static void AddedFilesRemove(void *pItem, addedfile_t **itemHead)
+{
+ addedfile_t *item = (addedfile_t *)pItem;
+
+ if (item == *itemHead) // Start of list
+ {
+ *itemHead = item->next;
+
+ if (*itemHead)
+ (*itemHead)->prev = NULL;
+ }
+ else if (item->next == NULL) // end of list
+ {
+ item->prev->next = NULL;
+ }
+ else // Somewhere in between
+ {
+ item->prev->next = item->next;
+ item->next->prev = item->prev;
+ }
+
+ Z_Free(item->value);
+ Z_Free(item);
+}
+
+static void AddedFilesClearList(addedfile_t **itemHead)
+{
+ addedfile_t *item;
+ addedfile_t *next;
+ for (item = *itemHead; item; item = next)
+ {
+ next = item->next;
+ AddedFilesRemove(item, itemHead);
+ }
+}
+
/** Adds a pwad at runtime.
* Searches for sounds, maps, music, new images.
*/
@@ -3318,8 +3367,7 @@ static void Command_Addfile(void)
size_t argc = COM_Argc(); // amount of arguments total
size_t curarg; // current argument index
- const char *addedfiles[argc]; // list of filenames already processed
- size_t numfilesadded = 0; // the amount of filenames processed
+ addedfile_t *addedfiles = NULL; // list of filenames already processed
if (argc < 2)
{
@@ -3334,25 +3382,14 @@ static void Command_Addfile(void)
char buf[256];
char *buf_p = buf;
INT32 i;
- size_t ii;
int musiconly; // W_VerifyNMUSlumps isn't boolean
boolean fileadded = false;
fn = COM_Argv(curarg);
// For the amount of filenames previously processed...
- for (ii = 0; ii < numfilesadded; ii++)
- {
- // If this is one of them, don't try to add it.
- if (!strcmp(fn, addedfiles[ii]))
- {
- fileadded = true;
- break;
- }
- }
-
- // If we've added this one, skip to the next one.
- if (fileadded)
+ fileadded = AddedFileContains(addedfiles, fn);
+ if (fileadded) // If this is one of them, don't try to add it.
{
CONS_Alert(CONS_WARNING, M_GetText("Already processed %s, skipping\n"), fn);
continue;
@@ -3361,13 +3398,16 @@ static void Command_Addfile(void)
// Disallow non-printing characters and semicolons.
for (i = 0; fn[i] != '\0'; i++)
if (!isprint(fn[i]) || fn[i] == ';')
+ {
+ AddedFilesClearList(&addedfiles);
return;
+ }
musiconly = W_VerifyNMUSlumps(fn, false);
if (musiconly == -1)
{
- addedfiles[numfilesadded++] = fn;
+ AddedFilesAdd(&addedfiles, fn);
continue;
}
@@ -3386,7 +3426,7 @@ static void Command_Addfile(void)
if (!(netgame || multiplayer) || musiconly)
{
P_AddWadFile(fn);
- addedfiles[numfilesadded++] = fn;
+ AddedFilesAdd(&addedfiles, fn);
continue;
}
@@ -3401,6 +3441,7 @@ static void Command_Addfile(void)
if (numwadfiles >= MAX_WADFILES)
{
CONS_Alert(CONS_ERROR, M_GetText("Too many files loaded to add %s\n"), fn);
+ AddedFilesClearList(&addedfiles);
return;
}
@@ -3440,13 +3481,15 @@ static void Command_Addfile(void)
WRITEMEM(buf_p, md5sum, 16);
}
- addedfiles[numfilesadded++] = fn;
+ AddedFilesAdd(&addedfiles, fn);
if (IsPlayerAdmin(consoleplayer) && (!server)) // Request to add file
SendNetXCmd(XD_REQADDFILE, buf, buf_p - buf);
else
SendNetXCmd(XD_ADDFILE, buf, buf_p - buf);
}
+
+ AddedFilesClearList(&addedfiles);
}
static void Command_Addfolder(void)
@@ -3454,8 +3497,7 @@ static void Command_Addfolder(void)
size_t argc = COM_Argc(); // amount of arguments total
size_t curarg; // current argument index
- const char *addedfolders[argc]; // list of filenames already processed
- size_t numfoldersadded = 0; // the amount of filenames processed
+ addedfile_t *addedfolders = NULL; // list of filenames already processed
if (argc < 2)
{
@@ -3471,24 +3513,13 @@ static void Command_Addfolder(void)
char buf[256];
char *buf_p = buf;
INT32 i, stat;
- size_t ii;
boolean folderadded = false;
fn = COM_Argv(curarg);
// For the amount of filenames previously processed...
- for (ii = 0; ii < numfoldersadded; ii++)
- {
- // If this is one of them, don't try to add it.
- if (!strcmp(fn, addedfolders[ii]))
- {
- folderadded = true;
- break;
- }
- }
-
- // If we've added this one, skip to the next one.
- if (folderadded)
+ folderadded = AddedFileContains(addedfolders, fn);
+ if (folderadded) // If we've added this one, skip to the next one.
{
CONS_Alert(CONS_WARNING, M_GetText("Already processed %s, skipping\n"), fn);
continue;
@@ -3497,13 +3528,16 @@ static void Command_Addfolder(void)
// Disallow non-printing characters and semicolons.
for (i = 0; fn[i] != '\0'; i++)
if (!isprint(fn[i]) || fn[i] == ';')
+ {
+ AddedFilesClearList(&addedfolders);
return;
+ }
// Add file on your client directly if you aren't in a netgame.
if (!(netgame || multiplayer))
{
P_AddFolder(fn);
- addedfolders[numfoldersadded++] = fn;
+ AddedFilesAdd(&addedfolders, fn);
continue;
}
@@ -3525,6 +3559,7 @@ static void Command_Addfolder(void)
if (numwadfiles >= MAX_WADFILES)
{
CONS_Alert(CONS_ERROR, M_GetText("Too many files loaded to add %s\n"), fn);
+ AddedFilesClearList(&addedfolders);
return;
}
@@ -3570,7 +3605,7 @@ static void Command_Addfolder(void)
Z_Free(fullpath);
- addedfolders[numfoldersadded++] = fn;
+ AddedFilesAdd(&addedfolders, fn);
WRITESTRINGN(buf_p,p,240);
@@ -3929,18 +3964,12 @@ void ItemFinder_OnChange(void)
if (!cv_itemfinder.value)
return; // it's fine.
- if (!M_SecretUnlocked(SECRET_ITEMFINDER))
+ if (!M_SecretUnlocked(SECRET_ITEMFINDER, clientGamedata))
{
CONS_Printf(M_GetText("You haven't earned this yet.\n"));
CV_StealthSetValue(&cv_itemfinder, 0);
return;
}
- else if (netgame || multiplayer)
- {
- CONS_Printf(M_GetText("This only works in single player.\n"));
- CV_StealthSetValue(&cv_itemfinder, 0);
- return;
- }
}
/** Deals with a pointlimit change by printing the change to the console.
@@ -4289,7 +4318,7 @@ void D_GameTypeChanged(INT32 lastgametype)
static void Ringslinger_OnChange(void)
{
- if (!M_SecretUnlocked(SECRET_PANDORA) && !netgame && cv_ringslinger.value && !cv_debug)
+ if (!M_SecretUnlocked(SECRET_PANDORA, serverGamedata) && !netgame && cv_ringslinger.value && !cv_debug)
{
CONS_Printf(M_GetText("You haven't earned this yet.\n"));
CV_StealthSetValue(&cv_ringslinger, 0);
@@ -4297,12 +4326,12 @@ static void Ringslinger_OnChange(void)
}
if (cv_ringslinger.value) // Only if it's been turned on
- G_SetGameModified(multiplayer);
+ G_SetUsedCheats(false);
}
static void Gravity_OnChange(void)
{
- if (!M_SecretUnlocked(SECRET_PANDORA) && !netgame && !cv_debug
+ if (!M_SecretUnlocked(SECRET_PANDORA, serverGamedata) && !netgame && !cv_debug
&& strcmp(cv_gravity.string, cv_gravity.defaultvalue))
{
CONS_Printf(M_GetText("You haven't earned this yet.\n"));
@@ -4318,7 +4347,7 @@ static void Gravity_OnChange(void)
#endif
if (!CV_IsSetToDefault(&cv_gravity))
- G_SetGameModified(multiplayer);
+ G_SetUsedCheats(false);
gravity = cv_gravity.value;
}
@@ -4599,10 +4628,9 @@ void Command_ExitGame_f(void)
botskin = 0;
cv_debug = 0;
emeralds = 0;
+ automapactive = false;
memset(&luabanks, 0, sizeof(luabanks));
- P_StopRumble(NULL);
-
if (dirmenu)
closefilemenu(true);
@@ -4636,7 +4664,7 @@ static void Fishcake_OnChange(void)
// so don't make modifiedgame always on!
if (cv_debug)
{
- G_SetGameModified(multiplayer);
+ G_SetUsedCheats(false);
}
else if (cv_debug != cv_fishcake.value)
@@ -4653,11 +4681,11 @@ static void Fishcake_OnChange(void)
static void Command_Isgamemodified_f(void)
{
if (savemoddata)
- CONS_Printf(M_GetText("modifiedgame is true, but you can save emblem and time data in this mod.\n"));
+ CONS_Printf(M_GetText("modifiedgame is true, but you can save time data in this mod.\n"));
else if (modifiedgame)
- CONS_Printf(M_GetText("modifiedgame is true, extras will not be unlocked\n"));
+ CONS_Printf(M_GetText("modifiedgame is true, time data can't be saved\n"));
else
- CONS_Printf(M_GetText("modifiedgame is false, you can unlock extras\n"));
+ CONS_Printf(M_GetText("modifiedgame is false, you can save time data\n"));
}
static void Command_Cheats_f(void)
diff --git a/src/netcode/d_netcmd.h b/src/netcode/d_netcmd.h
index 797a686a7..22ee0695d 100644
--- a/src/netcode/d_netcmd.h
+++ b/src/netcode/d_netcmd.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2022 by Sonic Team Junior.
+// Copyright (C) 1999-2023 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -33,10 +33,14 @@ extern consvar_t cv_defaultskin2;
extern consvar_t cv_seenames, cv_allowseenames;
extern consvar_t cv_usemouse;
-extern consvar_t cv_usegamepad[2];
-extern consvar_t cv_gamepad_scale[2];
-extern consvar_t cv_gamepad_rumble[2];
-extern consvar_t cv_gamepad_autopause;
+extern consvar_t cv_usejoystick;
+extern consvar_t cv_usejoystick2;
+#ifdef LJOYSTICK
+extern consvar_t cv_joyport;
+extern consvar_t cv_joyport2;
+#endif
+extern consvar_t cv_joyscale;
+extern consvar_t cv_joyscale2;
// splitscreen with second mouse
extern consvar_t cv_mouse2port;
diff --git a/src/netcode/d_netfil.c b/src/netcode/d_netfil.c
index 10b7359ad..c5ddef7b6 100644
--- a/src/netcode/d_netfil.c
+++ b/src/netcode/d_netfil.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2022 by Sonic Team Junior.
+// Copyright (C) 1999-2023 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -504,7 +504,7 @@ INT32 CL_CheckFiles(void)
CONS_Debug(DBG_NETPLAY, "searching for '%s' ", fileneeded[i].filename);
// Check in already loaded files
- for (j = mainwads; wadfiles[j]; j++)
+ for (j = mainwads; j < numwadfiles; j++)
{
nameonly(strcpy(wadfilename, wadfiles[j]->filename));
if (!stricmp(wadfilename, fileneeded[i].filename) &&
diff --git a/src/netcode/d_netfil.h b/src/netcode/d_netfil.h
index 850e24d49..fdbec8c53 100644
--- a/src/netcode/d_netfil.h
+++ b/src/netcode/d_netfil.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2022 by Sonic Team Junior.
+// Copyright (C) 1999-2023 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/netcode/gamestate.c b/src/netcode/gamestate.c
index c1ceb95b5..9c243ea73 100644
--- a/src/netcode/gamestate.c
+++ b/src/netcode/gamestate.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2022 by Sonic Team Junior.
+// Copyright (C) 1999-2023 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -29,7 +29,6 @@
#include "../lua_script.h"
#include "../lzf.h"
#include "../m_misc.h"
-#include "../p_haptic.h"
#include "../p_local.h"
#include "../p_saveg.h"
#include "../r_main.h"
@@ -200,8 +199,6 @@ void CL_LoadReceivedSavegame(boolean reloading)
titledemo = false;
automapactive = false;
- P_StopRumble(NULL);
-
// load a base level
if (P_LoadNetGame(reloading))
{
diff --git a/src/netcode/gamestate.h b/src/netcode/gamestate.h
index 9d2779772..a2fae1f14 100644
--- a/src/netcode/gamestate.h
+++ b/src/netcode/gamestate.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2022 by Sonic Team Junior.
+// Copyright (C) 1999-2023 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/netcode/http-mserv.c b/src/netcode/http-mserv.c
index 68e46b52a..7dc157ee4 100644
--- a/src/netcode/http-mserv.c
+++ b/src/netcode/http-mserv.c
@@ -1,6 +1,6 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
-// Copyright (C) 2020-2022 by James R.
+// Copyright (C) 2020-2023 by James R.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -66,6 +66,8 @@ static I_mutex hms_api_mutex;
static char *hms_server_token;
+static char hms_useragent[512];
+
struct HMS_buffer
{
CURL *curl;
@@ -82,6 +84,22 @@ Contact_error (void)
);
}
+static void
+get_user_agent(char *buf, size_t len)
+{
+ if (snprintf(buf, len, "%s/%s (%s; %s; %i; %i) SRB2BASE/%i", SRB2APPLICATION, VERSIONSTRING, compbranch, comprevision, MODID, MODVERSION, CODEBASE) < 0)
+ I_Error("http-mserv: get_user_agent failed");
+}
+
+static void
+init_user_agent_once(void)
+{
+ if (hms_useragent[0] != '\0')
+ return;
+
+ get_user_agent(hms_useragent, 512);
+}
+
static size_t
HMS_on_read (char *s, size_t _1, size_t n, void *userdata)
{
@@ -157,6 +175,8 @@ HMS_connect (const char *format, ...)
I_lock_mutex(&hms_api_mutex);
#endif
+ init_user_agent_once();
+
seek = strlen(hms_api) + 1;/* + '/' */
va_start (ap, format);
@@ -197,12 +217,18 @@ HMS_connect (const char *format, ...)
curl_easy_setopt(curl, CURLOPT_URL, url);
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
- curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
+
+#ifndef NO_IPV6
+ if (M_CheckParm("-noipv6"))
+#endif
+ curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
curl_easy_setopt(curl, CURLOPT_TIMEOUT, cv_masterserver_timeout.value);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, HMS_on_read);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, buffer);
+ curl_easy_setopt(curl, CURLOPT_USERAGENT, hms_useragent);
+
curl_free(quack_token);
free(url);
diff --git a/src/netcode/i_addrinfo.c b/src/netcode/i_addrinfo.c
index 49aadf27d..9efaff4da 100644
--- a/src/netcode/i_addrinfo.c
+++ b/src/netcode/i_addrinfo.c
@@ -1,6 +1,6 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
-// Copyright (C) 2011-2022 by Sonic Team Junior.
+// Copyright (C) 2011-2023 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/netcode/i_addrinfo.h b/src/netcode/i_addrinfo.h
index 592e693f4..79cfb05b2 100644
--- a/src/netcode/i_addrinfo.h
+++ b/src/netcode/i_addrinfo.h
@@ -1,6 +1,6 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
-// Copyright (C) 2011-2022 by Sonic Team Junior.
+// Copyright (C) 2011-2023 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/netcode/i_net.h b/src/netcode/i_net.h
index 66126d050..09b842296 100644
--- a/src/netcode/i_net.h
+++ b/src/netcode/i_net.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2022 by Sonic Team Junior.
+// Copyright (C) 1999-2023 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -109,6 +109,17 @@ extern boolean (*I_NetCanSend)(void);
*/
extern void (*I_NetFreeNodenum)(INT32 nodenum);
+/**
+ \brief split a string into address and port
+
+ \param address string to split
+
+ \param port double pointer to hold port component (optional)
+
+ \return address component
+*/
+extern char *I_NetSplitAddress(char *address, char **port);
+
/** \brief open a connection with specified address
\param address address to connect to
diff --git a/src/netcode/i_tcp.c b/src/netcode/i_tcp.c
index bd950c355..698234579 100644
--- a/src/netcode/i_tcp.c
+++ b/src/netcode/i_tcp.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2022 by Sonic Team Junior.
+// Copyright (C) 1999-2023 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -328,8 +328,14 @@ static inline void I_UPnP_rem(const char *port, const char * servicetype)
static const char *SOCK_AddrToStr(mysockaddr_t *sk)
{
- static char s[64]; // 255.255.255.255:65535 or IPv6:65535
+ static char s[64]; // 255.255.255.255:65535 or
+ // [ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]:65535
#ifdef HAVE_NTOP
+#ifdef HAVE_IPV6
+ int v6 = (sk->any.sa_family == AF_INET6);
+#else
+ int v6 = 0;
+#endif
void *addr;
if(sk->any.sa_family == AF_INET)
@@ -343,14 +349,21 @@ static const char *SOCK_AddrToStr(mysockaddr_t *sk)
if(addr == NULL)
sprintf(s, "No address");
- else if(inet_ntop(sk->any.sa_family, addr, s, sizeof (s)) == NULL)
+ else if(inet_ntop(sk->any.sa_family, addr, &s[v6], sizeof (s) - v6) == NULL)
sprintf(s, "Unknown family type, error #%u", errno);
#ifdef HAVE_IPV6
- else if(sk->any.sa_family == AF_INET6 && sk->ip6.sin6_port != 0)
- strcat(s, va(":%d", ntohs(sk->ip6.sin6_port)));
+ else if(sk->any.sa_family == AF_INET6)
+ {
+ s[0] = '[';
+ strcat(s, "]");
+
+ if (sk->ip6.sin6_port != 0)
+ strcat(s, va(":%d", ntohs(sk->ip6.sin6_port)));
+ }
#endif
else if(sk->any.sa_family == AF_INET && sk->ip4.sin_port != 0)
strcat(s, va(":%d", ntohs(sk->ip4.sin_port)));
+
#else
if (sk->any.sa_family == AF_INET)
{
@@ -401,7 +414,7 @@ static boolean SOCK_cmpaddr(mysockaddr_t *a, mysockaddr_t *b, UINT8 mask)
&& (b->ip4.sin_port == 0 || (a->ip4.sin_port == b->ip4.sin_port));
#ifdef HAVE_IPV6
else if (b->any.sa_family == AF_INET6)
- return memcmp(&a->ip6.sin6_addr, &b->ip6.sin6_addr, sizeof(b->ip6.sin6_addr))
+ return !memcmp(&a->ip6.sin6_addr, &b->ip6.sin6_addr, sizeof(b->ip6.sin6_addr))
&& (b->ip6.sin6_port == 0 || (a->ip6.sin6_port == b->ip6.sin6_port));
#endif
else
@@ -692,8 +705,7 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
unsigned long trueval = true;
#endif
mysockaddr_t straddr;
- struct sockaddr_in sin;
- socklen_t len = sizeof(sin);
+ socklen_t len = sizeof(straddr);
if (s == (SOCKET_TYPE)ERRSOCKET)
return (SOCKET_TYPE)ERRSOCKET;
@@ -711,14 +723,12 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
}
#endif
- straddr.any = *addr;
+ memcpy(&straddr, addr, addrlen);
I_OutputMsg("Binding to %s\n", SOCK_AddrToStr(&straddr));
if (family == AF_INET)
{
- mysockaddr_t tmpaddr;
- tmpaddr.any = *addr ;
- if (tmpaddr.ip4.sin_addr.s_addr == htonl(INADDR_ANY))
+ if (straddr.ip4.sin_addr.s_addr == htonl(INADDR_ANY))
{
opt = true;
opts = (socklen_t)sizeof(opt);
@@ -735,7 +745,7 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
#ifdef HAVE_IPV6
else if (family == AF_INET6)
{
- if (memcmp(addr, &in6addr_any, sizeof(in6addr_any)) == 0) //IN6_ARE_ADDR_EQUAL
+ if (memcmp(&straddr.ip6.sin6_addr, &in6addr_any, sizeof(in6addr_any)) == 0) //IN6_ARE_ADDR_EQUAL
{
opt = true;
opts = (socklen_t)sizeof(opt);
@@ -745,7 +755,7 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
// make it IPv6 ony
opt = true;
opts = (socklen_t)sizeof(opt);
- if (setsockopt(s, SOL_SOCKET, IPV6_V6ONLY, (char *)&opt, opts))
+ if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, (char *)&opt, opts))
{
CONS_Alert(CONS_WARNING, M_GetText("Could not limit IPv6 bind\n")); // I do not care anymore
}
@@ -787,10 +797,17 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
CONS_Printf(M_GetText("Network system buffer set to: %dKb\n"), opt>>10);
}
- if (getsockname(s, (struct sockaddr *)&sin, &len) == -1)
+ if (getsockname(s, &straddr.any, &len) == -1)
CONS_Alert(CONS_WARNING, M_GetText("Failed to get port number\n"));
else
- current_port = (UINT16)ntohs(sin.sin_port);
+ {
+ if (family == AF_INET)
+ current_port = (UINT16)ntohs(straddr.ip4.sin_port);
+#ifdef HAVE_IPV6
+ else if (family == AF_INET6)
+ current_port = (UINT16)ntohs(straddr.ip6.sin6_port);
+#endif
+ }
return s;
}
@@ -801,7 +818,7 @@ static boolean UDP_Socket(void)
struct my_addrinfo *ai, *runp, hints;
int gaie;
#ifdef HAVE_IPV6
- const INT32 b_ipv6 = M_CheckParm("-ipv6");
+ const INT32 b_ipv6 = !M_CheckParm("-noipv6");
#endif
const char *serv;
@@ -1105,6 +1122,7 @@ static SINT8 SOCK_NetMakeNodewPort(const char *address, const char *port)
SINT8 newnode = -1;
struct my_addrinfo *ai = NULL, *runp, hints;
int gaie;
+ size_t i;
if (!port || !port[0])
port = DEFAULTPORT;
@@ -1132,13 +1150,24 @@ static SINT8 SOCK_NetMakeNodewPort(const char *address, const char *port)
while (runp != NULL)
{
- // find ip of the server
- if (sendto(mysockets[0], NULL, 0, 0, runp->ai_addr, runp->ai_addrlen) == 0)
+ // test ip address of server
+ for (i = 0; i < mysocketses; ++i)
{
- memcpy(&clientaddress[newnode], runp->ai_addr, runp->ai_addrlen);
- break;
+ /* sendto tests that there is a network to this
+ address */
+ if (runp->ai_addr->sa_family == myfamily[i] &&
+ sendto(mysockets[i], NULL, 0, 0,
+ runp->ai_addr, runp->ai_addrlen) == 0)
+ {
+ memcpy(&clientaddress[newnode], runp->ai_addr, runp->ai_addrlen);
+ break;
+ }
}
- runp = runp->ai_next;
+
+ if (i < mysocketses)
+ runp = runp->ai_next;
+ else
+ break;
}
I_freeaddrinfo(ai);
return newnode;
diff --git a/src/netcode/i_tcp.h b/src/netcode/i_tcp.h
index b6e5b9235..ae9983bf1 100644
--- a/src/netcode/i_tcp.h
+++ b/src/netcode/i_tcp.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2022 by Sonic Team Junior.
+// Copyright (C) 1999-2023 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/netcode/mserv.c b/src/netcode/mserv.c
index f603d78e5..1c7f3e08d 100644
--- a/src/netcode/mserv.c
+++ b/src/netcode/mserv.c
@@ -1,8 +1,8 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2022 by Sonic Team Junior.
-// Copyright (C) 2020-2022 by James R.
+// Copyright (C) 1999-2023 by Sonic Team Junior.
+// Copyright (C) 2020-2023 by James R.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -61,7 +61,7 @@ static CV_PossibleValue_t masterserver_update_rate_cons_t[] = {
};
consvar_t cv_masterserver = CVAR_INIT ("masterserver", "https://mb.srb2.org/MS/0", CV_SAVE|CV_CALL, NULL, MasterServer_OnChange);
-consvar_t cv_servername = CVAR_INIT ("servername", "SRB2 server", CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT, NULL, Update_parameters);
+consvar_t cv_servername = CVAR_INIT ("servername", "SRB2 server", CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT|CV_ALLOWLUA, NULL, Update_parameters);
consvar_t cv_masterserver_update_rate = CVAR_INIT ("masterserver_update_rate", "15", CV_SAVE|CV_CALL|CV_NOINIT, masterserver_update_rate_cons_t, Update_parameters);
@@ -95,8 +95,8 @@ void AddMServCommands(void)
CV_RegisterVar(&cv_masterserver_token);
CV_RegisterVar(&cv_servername);
#ifdef MASTERSERVER
- COM_AddCommand("listserv", Command_Listserv_f);
- COM_AddCommand("masterserver_update", Update_parameters); // allows people to updates manually in case you were delisted by accident
+ COM_AddCommand("listserv", Command_Listserv_f, 0);
+ COM_AddCommand("masterserver_update", Update_parameters, COM_LUA); // allows people to updates manually in case you were delisted by accident
#endif
}
diff --git a/src/netcode/mserv.h b/src/netcode/mserv.h
index 7fdf3ed1b..0bc8c8e6b 100644
--- a/src/netcode/mserv.h
+++ b/src/netcode/mserv.h
@@ -1,8 +1,8 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2022 by Sonic Team Junior.
-// Copyright (C) 2020-2022 by James R.
+// Copyright (C) 1999-2023 by Sonic Team Junior.
+// Copyright (C) 2020-2023 by James R.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -33,7 +33,7 @@ typedef union
typedef struct
{
msg_header_t header;
- char ip[16];
+ char ip[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"];
char port[8];
char name[32];
INT32 room;
diff --git a/src/netcode/net_command.c b/src/netcode/net_command.c
index efc8bd0ef..2b3abfd02 100644
--- a/src/netcode/net_command.c
+++ b/src/netcode/net_command.c
@@ -321,22 +321,18 @@ void SV_WriteNetCommandsForTic(tic_t tic, UINT8 **buf)
}
}
-void CL_CopyNetCommandsFromServerPacket(tic_t tic)
+void CL_CopyNetCommandsFromServerPacket(tic_t tic, UINT8 **buf)
{
- servertics_pak *packet = &netbuffer->u.serverpak;
- UINT8 *cmds = (UINT8*)&packet->cmds[packet->numslots * packet->numtics];
- UINT8 numcmds;
-
- numcmds = *cmds++;
+ UINT8 numcmds = *(*buf)++;
for (UINT32 i = 0; i < numcmds; i++)
{
- INT32 playernum = *cmds++; // playernum
- size_t size = cmds[0]+1;
+ INT32 playernum = *(*buf)++; // playernum
+ size_t size = (*buf)[0]+1;
if (tic >= gametic) // Don't copy old net commands
- M_Memcpy(D_GetTextcmd(tic, playernum), cmds, size);
- cmds += size;
+ M_Memcpy(D_GetTextcmd(tic, playernum), *buf, size);
+ *buf += size;
}
}
diff --git a/src/netcode/net_command.h b/src/netcode/net_command.h
index cc26aeb0e..a0c46f3a2 100644
--- a/src/netcode/net_command.h
+++ b/src/netcode/net_command.h
@@ -58,7 +58,7 @@ size_t TotalTextCmdPerTic(tic_t tic);
void PT_TextCmd(SINT8 node, INT32 netconsole);
void SV_WriteNetCommandsForTic(tic_t tic, UINT8 **buf);
-void CL_CopyNetCommandsFromServerPacket(tic_t tic);
+void CL_CopyNetCommandsFromServerPacket(tic_t tic, UINT8 **buf);
void CL_SendNetCommands(void);
void SendKick(UINT8 playernum, UINT8 msg);
void SendKicksForNode(SINT8 node, UINT8 msg);
diff --git a/src/netcode/protocol.h b/src/netcode/protocol.h
index 9866e4c5a..a992e3b69 100644
--- a/src/netcode/protocol.h
+++ b/src/netcode/protocol.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2022 by Sonic Team Junior.
+// Copyright (C) 1999-2023 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -72,6 +72,8 @@ typedef enum
PT_ASKLUAFILE, // Client telling the server they don't have the file
PT_HASLUAFILE, // Client telling the server they have the file
+ PT_BASICKEEPALIVE, // Keep the network alive during wipes, as tics aren't advanced and NetUpdate isn't called
+
// Add non-PT_CANFAIL packet types here to avoid breaking MS compatibility.
PT_CANFAIL, // This is kind of a priority. Anything bigger than CANFAIL
@@ -143,6 +145,7 @@ typedef struct
UINT8 gametype;
UINT8 modifiedgame;
+ UINT8 usedCheats;
char server_context[8]; // Unique context id, generated at server startup.
} ATTRPACK serverconfig_pak;
diff --git a/src/netcode/server_connection.c b/src/netcode/server_connection.c
index f8ec3c7bd..2164f411a 100644
--- a/src/netcode/server_connection.c
+++ b/src/netcode/server_connection.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2022 by Sonic Team Junior.
+// Copyright (C) 1999-2023 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -39,10 +39,10 @@ char playeraddress[MAXPLAYERS][64];
consvar_t cv_showjoinaddress = CVAR_INIT ("showjoinaddress", "Off", CV_SAVE|CV_NETVAR, CV_OnOff, NULL);
-consvar_t cv_allownewplayer = CVAR_INIT ("allowjoin", "On", CV_SAVE|CV_NETVAR, CV_OnOff, NULL);
+consvar_t cv_allownewplayer = CVAR_INIT ("allowjoin", "On", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_OnOff, NULL);
static CV_PossibleValue_t maxplayers_cons_t[] = {{2, "MIN"}, {32, "MAX"}, {0, NULL}};
-consvar_t cv_maxplayers = CVAR_INIT ("maxplayers", "8", CV_SAVE|CV_NETVAR, maxplayers_cons_t, NULL);
+consvar_t cv_maxplayers = CVAR_INIT ("maxplayers", "8", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, maxplayers_cons_t, NULL);
static CV_PossibleValue_t joindelay_cons_t[] = {{1, "MIN"}, {3600, "MAX"}, {0, "Off"}, {0, NULL}};
consvar_t cv_joindelay = CVAR_INIT ("joindelay", "10", CV_SAVE|CV_NETVAR, joindelay_cons_t, NULL);
@@ -52,9 +52,9 @@ consvar_t cv_rejointimeout = CVAR_INIT ("rejointimeout", "2", CV_SAVE|CV_NETVAR|
static INT32 FindRejoinerNum(SINT8 node)
{
- char strippednodeaddress[64];
+ char addressbuffer[64];
const char *nodeaddress;
- char *port;
+ const char *strippednodeaddress;
// Make sure there is no dead dress before proceeding to the stripping
if (!I_GetNodeAddress)
@@ -64,10 +64,8 @@ static INT32 FindRejoinerNum(SINT8 node)
return -1;
// Strip the address of its port
- strcpy(strippednodeaddress, nodeaddress);
- port = strchr(strippednodeaddress, ':');
- if (port)
- *port = '\0';
+ strcpy(addressbuffer, nodeaddress);
+ strippednodeaddress = I_NetSplitAddress(addressbuffer, NULL);
// Check if any player matches the stripped address
for (INT32 i = 0; i < MAXPLAYERS; i++)
@@ -110,8 +108,9 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime)
netbuffer->u.serverinfo.time = (tic_t)LONG(servertime);
netbuffer->u.serverinfo.leveltime = (tic_t)LONG(leveltime);
- netbuffer->u.serverinfo.numberofplayer = (UINT8)D_NumPlayers();
- netbuffer->u.serverinfo.maxplayer = (UINT8)cv_maxplayers.value;
+ // Exclude bots from both counts
+ netbuffer->u.serverinfo.numberofplayer = (UINT8)(D_NumPlayers() - D_NumBots());
+ netbuffer->u.serverinfo.maxplayer = (UINT8)(cv_maxplayers.value - D_NumBots());
netbuffer->u.serverinfo.refusereason = GetRefuseReason(node);
@@ -237,6 +236,7 @@ static boolean SV_SendServerConfig(INT32 node)
netbuffer->u.servercfg.gamestate = (UINT8)gamestate;
netbuffer->u.servercfg.gametype = (UINT8)gametype;
netbuffer->u.servercfg.modifiedgame = (UINT8)modifiedgame;
+ netbuffer->u.servercfg.usedCheats = (UINT8)usedCheats;
memcpy(netbuffer->u.servercfg.server_context, server_context, 8);
diff --git a/src/netcode/server_connection.h b/src/netcode/server_connection.h
index 7481d0eb5..14ac5913c 100644
--- a/src/netcode/server_connection.h
+++ b/src/netcode/server_connection.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2022 by Sonic Team Junior.
+// Copyright (C) 1999-2023 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/netcode/tic_command.c b/src/netcode/tic_command.c
index 620a10f7a..7721bc3f1 100644
--- a/src/netcode/tic_command.c
+++ b/src/netcode/tic_command.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2022 by Sonic Team Junior.
+// Copyright (C) 1999-2023 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -100,9 +100,9 @@ void D_ResetTiccmds(void)
}
// Check ticcmd for "speed hacks"
-static void CheckTiccmdHacks(INT32 playernum)
+static void CheckTiccmdHacks(INT32 playernum, tic_t tic)
{
- ticcmd_t *cmd = &netcmds[maketic%BACKUPTICS][playernum];
+ ticcmd_t *cmd = &netcmds[tic%BACKUPTICS][playernum];
if (cmd->forwardmove > MAXPLMOVE || cmd->forwardmove < -MAXPLMOVE
|| cmd->sidemove > MAXPLMOVE || cmd->sidemove < -MAXPLMOVE)
{
@@ -177,31 +177,43 @@ void PT_ClientCmd(SINT8 nodenum, INT32 netconsole)
// Update the nettics
node->tic = realend;
- // Don't do anything for packets of type NODEKEEPALIVE?
- if (netconsole == -1 || netbuffer->packettype == PT_NODEKEEPALIVE
- || netbuffer->packettype == PT_NODEKEEPALIVEMIS)
+ // This should probably still timeout though, as the node should always have a player 1 number
+ if (netconsole == -1)
return;
// As long as clients send valid ticcmds, the server can keep running, so reset the timeout
/// \todo Use a separate cvar for that kind of timeout?
node->freezetimeout = I_GetTime() + connectiontimeout;
+ // Don't do anything for packets of type NODEKEEPALIVE?
+ // Sryder 2018/07/01: Update the freezetimeout still!
+ if (netbuffer->packettype == PT_NODEKEEPALIVE
+ || netbuffer->packettype == PT_NODEKEEPALIVEMIS)
+ return;
+
+ // If we've alredy received a ticcmd for this tic, just submit it for the next one.
+ tic_t faketic = maketic;
+ if ((!!(netcmds[maketic % BACKUPTICS][netconsole].angleturn & TICCMD_RECEIVED))
+ && (maketic - firstticstosend < BACKUPTICS - 1))
+ faketic++;
+
// Copy ticcmd
- G_MoveTiccmd(&netcmds[maketic%BACKUPTICS][netconsole], &netbuffer->u.clientpak.cmd, 1);
+ G_MoveTiccmd(&netcmds[faketic%BACKUPTICS][netconsole], &netbuffer->u.clientpak.cmd, 1);
// Splitscreen cmd
if ((netbuffer->packettype == PT_CLIENT2CMD || netbuffer->packettype == PT_CLIENT2MIS)
&& node->player2 >= 0)
- G_MoveTiccmd(&netcmds[maketic%BACKUPTICS][(UINT8)node->player2],
+ G_MoveTiccmd(&netcmds[faketic%BACKUPTICS][(UINT8)node->player2],
&netbuffer->u.client2pak.cmd2, 1);
- CheckTiccmdHacks(netconsole);
+ CheckTiccmdHacks(netconsole, faketic);
CheckConsistancy(nodenum, realstart);
}
void PT_ServerTics(SINT8 node, INT32 netconsole)
{
tic_t realend, realstart;
+ servertics_pak *packet = &netbuffer->u.serverpak;
if (!netnodes[node].ingame)
{
@@ -223,15 +235,16 @@ void PT_ServerTics(SINT8 node, INT32 netconsole)
return;
}
- realstart = netbuffer->u.serverpak.starttic;
- realend = realstart + netbuffer->u.serverpak.numtics;
+ realstart = packet->starttic;
+ realend = realstart + packet->numtics;
realend = min(realend, gametic + CLIENTBACKUPTICS);
cl_packetmissed = realstart > neededtic;
if (realstart <= neededtic && realend > neededtic)
{
- UINT8 *pak = (UINT8 *)&netbuffer->u.serverpak.cmds;
+ UINT8 *pak = (UINT8 *)&packet->cmds;
+ UINT8 *txtpak = (UINT8 *)&packet->cmds[packet->numslots * packet->numtics];
for (tic_t i = realstart; i < realend; i++)
{
@@ -240,9 +253,9 @@ void PT_ServerTics(SINT8 node, INT32 netconsole)
// copy the tics
pak = G_ScpyTiccmd(netcmds[i%BACKUPTICS], pak,
- netbuffer->u.serverpak.numslots*sizeof (ticcmd_t));
+ packet->numslots*sizeof (ticcmd_t));
- CL_CopyNetCommandsFromServerPacket(i);
+ CL_CopyNetCommandsFromServerPacket(i, &txtpak);
}
neededtic = realend;
@@ -257,35 +270,39 @@ void PT_ServerTics(SINT8 node, INT32 netconsole)
void CL_SendClientCmd(void)
{
size_t packetsize = 0;
+ boolean mis = false;
netbuffer->packettype = PT_CLIENTCMD;
if (cl_packetmissed)
- netbuffer->packettype++;
+ {
+ netbuffer->packettype = PT_CLIENTMIS;
+ mis = true;
+ }
+
netbuffer->u.clientpak.resendfrom = (UINT8)(neededtic & UINT8_MAX);
netbuffer->u.clientpak.client_tic = (UINT8)(gametic & UINT8_MAX);
if (gamestate == GS_WAITINGPLAYERS)
{
// Send PT_NODEKEEPALIVE packet
- netbuffer->packettype += 4;
+ netbuffer->packettype = (mis ? PT_NODEKEEPALIVEMIS : PT_NODEKEEPALIVE);
packetsize = sizeof (clientcmd_pak) - sizeof (ticcmd_t) - sizeof (INT16);
HSendPacket(servernode, false, 0, packetsize);
}
else if (gamestate != GS_NULL && (addedtogame || dedicated))
{
+ packetsize = sizeof (clientcmd_pak);
G_MoveTiccmd(&netbuffer->u.clientpak.cmd, &localcmds, 1);
netbuffer->u.clientpak.consistancy = SHORT(consistancy[gametic%BACKUPTICS]);
// Send a special packet with 2 cmd for splitscreen
if (splitscreen || botingame)
{
- netbuffer->packettype += 2;
- G_MoveTiccmd(&netbuffer->u.client2pak.cmd2, &localcmds2, 1);
+ netbuffer->packettype = (mis ? PT_CLIENT2MIS : PT_CLIENT2CMD);
packetsize = sizeof (client2cmd_pak);
+ G_MoveTiccmd(&netbuffer->u.client2pak.cmd2, &localcmds2, 1);
}
- else
- packetsize = sizeof (clientcmd_pak);
HSendPacket(servernode, false, 0, packetsize);
}
@@ -346,7 +363,7 @@ void SV_SendTics(void)
for (INT32 n = 1; n < MAXNETNODES; n++)
if (netnodes[n].ingame)
{
- netnode_t *node = netnodes[n];
+ netnode_t *node = &netnodes[n];
// assert node->supposedtic>=node->tic
realfirsttic = node->supposedtic;
@@ -408,7 +425,7 @@ void Local_Maketic(INT32 realtics)
// and G_MapEventsToControls
if (!dedicated)
rendergametic = gametic;
- // translate inputs (keyboard/mouse/gamepad) into game controls
+ // translate inputs (keyboard/mouse/joystick) into game controls
G_BuildTiccmd(&localcmds, realtics, 1);
if (splitscreen || botingame)
G_BuildTiccmd(&localcmds2, realtics, 2);
diff --git a/src/netcode/tic_command.h b/src/netcode/tic_command.h
index 289750fb3..725037216 100644
--- a/src/netcode/tic_command.h
+++ b/src/netcode/tic_command.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2022 by Sonic Team Junior.
+// Copyright (C) 1999-2023 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/snake.c b/src/snake.c
index 21e79401d..6482759ed 100644
--- a/src/snake.c
+++ b/src/snake.c
@@ -11,6 +11,8 @@
#include "snake.h"
#include "g_input.h"
+#include "g_game.h"
+#include "i_joy.h"
#include "m_random.h"
#include "s_sound.h"
#include "screen.h"
@@ -67,6 +69,9 @@ typedef struct snake_s
enum bonustype_s bonustype;
UINT8 bonusx;
UINT8 bonusy;
+
+ event_t *joyevents[MAXEVENTS];
+ UINT16 joyeventcount;
} snake_t;
static const char *bonuspatches[] = {
@@ -113,6 +118,8 @@ static void Initialise(snake_t *snake)
snake->appley = M_RandomKey(NUM_BLOCKS_Y);
snake->bonustype = BONUS_NONE;
+
+ snake->joyeventcount = 0;
}
static UINT8 GetOppositeDir(UINT8 dir)
@@ -160,18 +167,19 @@ void Snake_Update(void *opaque)
UINT8 oldx, oldy;
UINT16 i;
UINT16 joystate = 0;
+ static INT32 pjoyx = 0, pjoyy = 0;
snake_t *snake = opaque;
// Handle retry
- if (snake->gameover && (G_PlayerInputDown(0, GC_JUMP) || gamekeydown[KEY_ENTER]))
+ if (snake->gameover && (PLAYER1INPUTDOWN(GC_JUMP) || gamekeydown[KEY_ENTER]))
{
Initialise(snake);
snake->pausepressed = true; // Avoid accidental pause on respawn
}
// Handle pause
- if (G_PlayerInputDown(0, GC_PAUSE) || gamekeydown[KEY_ENTER])
+ if (PLAYER1INPUTDOWN(GC_PAUSE) || gamekeydown[KEY_ENTER])
{
if (!snake->pausepressed)
snake->paused = !snake->paused;
@@ -190,23 +198,58 @@ void Snake_Update(void *opaque)
oldx = snake->snakex[1];
oldy = snake->snakey[1];
+ // Process the input events in here dear lord
+ for (UINT16 j = 0; j < snake->joyeventcount; j++)
+ {
+ event_t *ev = snake->joyevents[j];
+ const INT32 jdeadzone = (JOYAXISRANGE * cv_digitaldeadzone.value) / FRACUNIT;
+ if (ev->y != INT32_MAX)
+ {
+ if (Joystick.bGamepadStyle || abs(ev->y) > jdeadzone)
+ {
+ if (ev->y < 0 && pjoyy >= 0)
+ joystate = 1;
+ else if (ev->y > 0 && pjoyy <= 0)
+ joystate = 2;
+ pjoyy = ev->y;
+ }
+ else
+ pjoyy = 0;
+ }
+
+ if (ev->x != INT32_MAX)
+ {
+ if (Joystick.bGamepadStyle || abs(ev->x) > jdeadzone)
+ {
+ if (ev->x < 0 && pjoyx >= 0)
+ joystate = 3;
+ else if (ev->x > 0 && pjoyx <= 0)
+ joystate = 4;
+ pjoyx = ev->x;
+ }
+ else
+ pjoyx = 0;
+ }
+ }
+ snake->joyeventcount = 0;
+
// Update direction
- if (G_PlayerInputDown(0, GC_STRAFELEFT) || gamekeydown[KEY_LEFTARROW] || joystate == 3)
+ if (PLAYER1INPUTDOWN(GC_STRAFELEFT) || gamekeydown[KEY_LEFTARROW] || joystate == 3)
{
if (snake->snakelength < 2 || x <= oldx)
snake->snakedir[0] = 1;
}
- else if (G_PlayerInputDown(0, GC_STRAFERIGHT) || gamekeydown[KEY_RIGHTARROW] || joystate == 4)
+ else if (PLAYER1INPUTDOWN(GC_STRAFERIGHT) || gamekeydown[KEY_RIGHTARROW] || joystate == 4)
{
if (snake->snakelength < 2 || x >= oldx)
snake->snakedir[0] = 2;
}
- else if (G_PlayerInputDown(0, GC_FORWARD) || gamekeydown[KEY_UPARROW] || joystate == 1)
+ else if (PLAYER1INPUTDOWN(GC_FORWARD) || gamekeydown[KEY_UPARROW] || joystate == 1)
{
if (snake->snakelength < 2 || y <= oldy)
snake->snakedir[0] = 3;
}
- else if (G_PlayerInputDown(0, GC_BACKWARD) || gamekeydown[KEY_DOWNARROW] || joystate == 2)
+ else if (PLAYER1INPUTDOWN(GC_BACKWARD) || gamekeydown[KEY_DOWNARROW] || joystate == 2)
{
if (snake->snakelength < 2 || y >= oldy)
snake->snakedir[0] = 4;
@@ -533,3 +576,18 @@ void Snake_Free(void **opaque)
*opaque = NULL;
}
}
+
+// I'm screaming the hack is clean - ashi
+boolean Snake_JoyGrabber(void *opaque, event_t *ev)
+{
+ snake_t *snake = opaque;
+
+ if (ev->type == ev_joystick && ev->key == 0)
+ {
+ snake->joyevents[snake->joyeventcount] = ev;
+ snake->joyeventcount++;
+ return true;
+ }
+ else
+ return false;
+}
diff --git a/src/snake.h b/src/snake.h
index a3106bb0f..6bca338e9 100644
--- a/src/snake.h
+++ b/src/snake.h
@@ -12,9 +12,12 @@
#ifndef __SNAKE__
#define __SNAKE__
+#include "d_event.h"
+
void Snake_Allocate(void **opaque);
void Snake_Update(void *opaque);
void Snake_Draw(void *opaque);
void Snake_Free(void **opaque);
+boolean Snake_JoyGrabber(void *opaque, event_t *ev);
#endif
--
GitLab