qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-06-02 01:21:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean out some dead code and variables.

Browse source 
We haven't had serial or ipx support for a long time.
This commit is contained in:
Bill Currie 2011-07-29 10:11:14 +09:00
parent 1e3f321070
commit 07d5b114bc
4 changed files with 3 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/QF/skin.h
View file

@ -38,8 +38,7 @@
#define RSSHOT_WIDTH 320 #define RSSHOT_WIDTH 320
#define RSSHOT_HEIGHT 200 #define RSSHOT_HEIGHT 200
typedef struct skin_s typedef struct skin_s {
{
char name[MAX_SKIN_LENGTH]; char name[MAX_SKIN_LENGTH];
qboolean failedload; // the name isn't a valid skin qboolean failedload; // the name isn't a valid skin
union { union {
@ -56,6 +55,8 @@ extern skin_t skin_cache[MAX_CACHED_SKINS];
extern int skin_textures; extern int skin_textures;
extern int skin_fb_textures; extern int skin_fb_textures;
extern int playercolor;
struct tex_s; struct tex_s;
struct tex_s *Skin_Cache (skin_t *skin); struct tex_s *Skin_Cache (skin_t *skin);
struct player_info_s; struct player_info_s;

17
include/netmain.h
View file

@ -188,8 +188,6 @@ extern int DEFAULTnet_hostport;
extern int net_hostport; extern int net_hostport;
extern int net_driverlevel; extern int net_driverlevel;
extern char playername[];
extern int playercolor;
extern int messagesSent; extern int messagesSent;
extern int messagesReceived; extern int messagesReceived;
@ -346,28 +344,13 @@ typedef struct _PollProcedure {
*/ */
void SchedulePollProcedure(PollProcedure *pp, double timeOffset); void SchedulePollProcedure(PollProcedure *pp, double timeOffset);
extern qboolean serialAvailable;
extern qboolean ipxAvailable;
extern qboolean tcpipAvailable; extern qboolean tcpipAvailable;
extern char my_ipx_address[NET_NAMELEN];
extern char my_tcpip_address[NET_NAMELEN]; extern char my_tcpip_address[NET_NAMELEN];
extern void (*GetComPortConfig) (int portNumber, int *port, int *irq, int *baud, qboolean *useModem);
extern void (*SetComPortConfig) (int portNumber, int port, int irq, int baud, qboolean useModem);
extern void (*GetModemConfig) (int portNumber, char *dialType, char *clear, char *init, char *hangup);
extern void (*SetModemConfig) (int portNumber, const char *dialType, const char *clear, const char *init, const char *hangup);
extern qboolean slistInProgress; extern qboolean slistInProgress;
extern qboolean slistSilent; extern qboolean slistSilent;
extern qboolean slistLocal; extern qboolean slistLocal;
extern struct cvar_s *config_com_port;
extern struct cvar_s *config_com_irq;
extern struct cvar_s *config_com_baud;
extern struct cvar_s *config_com_modem;
extern struct cvar_s *config_modem_dialtype;
extern struct cvar_s *config_modem_clear;
extern struct cvar_s *config_modem_init;
extern struct cvar_s *config_modem_hangup;
extern struct cvar_s *hostname; extern struct cvar_s *hostname;
extern QFile *vcrFile; extern QFile *vcrFile;

58
libs/net/net_main.c
View file

@ -57,25 +57,13 @@ qsocket_t *net_activeSockets = NULL;
qsocket_t *net_freeSockets = NULL; qsocket_t *net_freeSockets = NULL;
int net_numsockets = 0; int net_numsockets = 0;
qboolean serialAvailable = false;
qboolean ipxAvailable = false;
qboolean tcpipAvailable = false; qboolean tcpipAvailable = false;
int net_hostport; int net_hostport;
int DEFAULTnet_hostport = 26000; int DEFAULTnet_hostport = 26000;
char my_ipx_address[NET_NAMELEN];
char my_tcpip_address[NET_NAMELEN]; char my_tcpip_address[NET_NAMELEN];
void (*GetComPortConfig) (int portNumber, int *port, int *irq, int *baud,
qboolean *useModem);
void (*SetComPortConfig) (int portNumber, int port, int irq, int baud,
qboolean useModem);
void (*GetModemConfig) (int portNumber, char *dialType, char *clear,
char *init, char *hangup);
void (*SetModemConfig) (int portNumber, const char *dialType, const char *clear,
const char *init, const char *hangup);
static qboolean listening = false; static qboolean listening = false;
qboolean slistInProgress = false; qboolean slistInProgress = false;
@ -103,16 +91,6 @@ int unreliableMessagesReceived = 0;
cvar_t *net_messagetimeout; cvar_t *net_messagetimeout;
cvar_t *hostname; cvar_t *hostname;
qboolean configRestored = false;
cvar_t *config_com_port;
cvar_t *config_com_irq;
cvar_t *config_com_baud;
cvar_t *config_com_modem;
cvar_t *config_modem_dialtype;
cvar_t *config_modem_clear;
cvar_t *config_modem_init;
cvar_t *config_modem_hangup;
QFile *vcrFile; QFile *vcrFile;
qboolean recording = false; qboolean recording = false;
@ -791,22 +769,6 @@ NET_Init (void)
net_messagetimeout = net_messagetimeout =
Cvar_Get ("net_messagetimeout", "300", CVAR_NONE, NULL, "None"); Cvar_Get ("net_messagetimeout", "300", CVAR_NONE, NULL, "None");
hostname = Cvar_Get ("hostname", "UNNAMED", CVAR_NONE, NULL, "None"); hostname = Cvar_Get ("hostname", "UNNAMED", CVAR_NONE, NULL, "None");
config_com_port =
Cvar_Get ("_config_com_port", "0x3f8", CVAR_ARCHIVE, NULL, "None");
config_com_irq = Cvar_Get ("_config_com_irq", "4", CVAR_ARCHIVE, NULL,
"None");
config_com_baud =
Cvar_Get ("_config_com_baud", "57600", CVAR_ARCHIVE, NULL, "None");
config_com_modem =
Cvar_Get ("_config_com_modem", "1", CVAR_ARCHIVE, NULL, "None");
config_modem_dialtype =
Cvar_Get ("_config_modem_dialtype", "T", CVAR_ARCHIVE, NULL, "None");
config_modem_clear =
Cvar_Get ("_config_modem_clear", "ATZ", CVAR_ARCHIVE, NULL, "None");
config_modem_init =
Cvar_Get ("_config_modem_init", "", CVAR_ARCHIVE, NULL, "None");
config_modem_hangup =
Cvar_Get ("_config_modem_hangup", "AT H", CVAR_ARCHIVE, NULL, "None");
Cmd_AddCommand ("slist", NET_Slist_f, "No Description"); Cmd_AddCommand ("slist", NET_Slist_f, "No Description");
Cmd_AddCommand ("listen", NET_Listen_f, "No Description"); Cmd_AddCommand ("listen", NET_Listen_f, "No Description");
@ -825,8 +787,6 @@ NET_Init (void)
net_drivers[net_driverlevel].Listen (true); net_drivers[net_driverlevel].Listen (true);
} }
if (*my_ipx_address)
Sys_MaskPrintf (SYS_DEV, "IPX address %s\n", my_ipx_address);
if (*my_tcpip_address) if (*my_tcpip_address)
Sys_MaskPrintf (SYS_DEV, "TCP/IP address %s\n", my_tcpip_address); Sys_MaskPrintf (SYS_DEV, "TCP/IP address %s\n", my_tcpip_address);
} }
@ -865,24 +825,6 @@ void
NET_Poll (void) NET_Poll (void)
{ {
PollProcedure *pp; PollProcedure *pp;
qboolean useModem;
if (!configRestored) {
if (serialAvailable) {
if (config_com_modem->int_val)
useModem = true;
else
useModem = false;
SetComPortConfig (0, config_com_port->int_val,
config_com_irq->int_val, config_com_baud->int_val,
useModem);
SetModemConfig (0, config_modem_dialtype->string,
config_modem_clear->string,
config_modem_init->string,
config_modem_hangup->string);
}
configRestored = true;
}
SetNetTime (); SetNetTime ();

2
nq/source/host_cmd.c
View file

@ -100,8 +100,6 @@ Host_Status_f (void)
print ("version: %4.2f\n", PACKAGE_VERSION); print ("version: %4.2f\n", PACKAGE_VERSION);
if (tcpipAvailable) if (tcpipAvailable)
print ("tcp/ip: %s\n", my_tcpip_address); print ("tcp/ip: %s\n", my_tcpip_address);
if (ipxAvailable)
print ("ipx: %s\n", my_ipx_address);
print ("map: %s\n", sv.name); print ("map: %s\n", sv.name);
print ("players: %i active (%i max)\n\n", net_activeconnections, print ("players: %i active (%i max)\n\n", net_activeconnections,
svs.maxclients); svs.maxclients);