mirror of
https://github.com/UberGames/ioef.git
synced 2025-05-31 01:11:01 +00:00
Include #ifdef to make it easier to create a stand-alone binary.
This commit is contained in:
Thilo Schulz
parent
ca5fabe8c6
commit
b3822d03e2
10 changed files with 84 additions and 20 deletions
|
|
@ -1004,6 +1004,7 @@ If no response is received from the authorize server after two tries, the client
|
|||
in anyway.
|
||||
===================
|
||||
*/
|
||||
#ifndef STANDALONE
|
||||
void CL_RequestAuthorization( void ) {
|
||||
char nums[64];
|
||||
int i, j, l;
|
||||
|
|
@ -1047,7 +1048,7 @@ void CL_RequestAuthorization( void ) {
|
|||
|
||||
NET_OutOfBandPrint(NS_CLIENT, cls.authorizeServer, "getKeyAuthorize %i %s", fs->integer, nums );
|
||||
}
|
||||
|
||||
#endif
|
||||
/*
|
||||
======================================================================
|
||||
|
||||
|
|
@ -1710,9 +1711,11 @@ void CL_CheckForResend( void ) {
|
|||
switch ( cls.state ) {
|
||||
case CA_CONNECTING:
|
||||
// requesting a challenge .. IPv6 users always get in as authorize server supports no ipv6.
|
||||
#ifndef STANDALONE
|
||||
if ( clc.serverAddress.type == NA_IP && !Sys_IsLANAddress( clc.serverAddress ) ) {
|
||||
CL_RequestAuthorization();
|
||||
}
|
||||
#endif
|
||||
NET_OutOfBandPrint(NS_CLIENT, clc.serverAddress, "getchallenge");
|
||||
break;
|
||||
|
||||
|
|
|
|||
|
|
@ -2795,6 +2795,7 @@ static void FS_Startup( const char *gameName )
|
|||
Com_Printf( "%d files in pk3 files\n", fs_packFiles );
|
||||
}
|
||||
|
||||
#ifndef STANDALONE
|
||||
/*
|
||||
===================
|
||||
FS_CheckPak0
|
||||
|
|
@ -2891,6 +2892,7 @@ static void FS_CheckPak0( void )
|
|||
Com_Error(ERR_FATAL, "You need to install Quake III Arena in order to play");
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
=====================
|
||||
|
|
@ -3262,7 +3264,9 @@ void FS_InitFilesystem( void ) {
|
|||
// try to start up normally
|
||||
FS_Startup( BASEGAME );
|
||||
|
||||
#ifndef STANDALONE
|
||||
FS_CheckPak0( );
|
||||
#endif
|
||||
|
||||
// if we can't find default.cfg, assume that the paths are
|
||||
// busted and error out now, rather than getting an unreadable
|
||||
|
|
@ -3295,7 +3299,9 @@ void FS_Restart( int checksumFeed ) {
|
|||
// try to start up normally
|
||||
FS_Startup( BASEGAME );
|
||||
|
||||
#ifndef STANDALONE
|
||||
FS_CheckPak0( );
|
||||
#endif
|
||||
|
||||
// if we can't find default.cfg, assume that the paths are
|
||||
// busted and error out now, rather than getting an unreadable
|
||||
|
|
|
|||
|
|
@ -26,8 +26,19 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|||
// q_shared.h -- included first by ALL program modules.
|
||||
// A user mod should never modify this file
|
||||
|
||||
#define PRODUCT_NAME "ioq3"
|
||||
#define PRODUCT_VERSION "1.35"
|
||||
#ifdef STANDALONE
|
||||
#define PRODUCT_NAME "iofoo3"
|
||||
#define PRODUCT_VERSION "-1"
|
||||
#define BASEGAME "foobar"
|
||||
#define CLIENT_WINDOW_TITLE "changeme"
|
||||
#define CLIENT_WINDOW_MIN_TITLE "changeme2"
|
||||
#else
|
||||
#define PRODUCT_NAME "ioq3"
|
||||
#define PRODUCT_VERSION "1.35"
|
||||
#define BASEGAME "baseq3"
|
||||
#define CLIENT_WINDOW_TITLE "ioquake3"
|
||||
#define CLIENT_WINDOW_MIN_TITLE "ioq3"
|
||||
#endif
|
||||
|
||||
#ifdef SVN_VERSION
|
||||
# define Q3_VERSION PRODUCT_NAME " " SVN_VERSION
|
||||
|
|
@ -35,12 +46,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|||
# define Q3_VERSION PRODUCT_NAME " " PRODUCT_VERSION
|
||||
#endif
|
||||
|
||||
#define CLIENT_WINDOW_TITLE "ioquake3"
|
||||
#define CLIENT_WINDOW_MIN_TITLE "ioq3"
|
||||
// 1.32 released 7-10-2002
|
||||
|
||||
#define BASEGAME "baseq3"
|
||||
|
||||
#define MAX_TEAMNAME 32
|
||||
|
||||
#ifdef _MSC_VER
|
||||
|
|
|
|||
|
|
@ -243,15 +243,18 @@ extern int demo_protocols[];
|
|||
#ifndef MASTER_SERVER_NAME
|
||||
#define MASTER_SERVER_NAME "master.quake3arena.com"
|
||||
#endif
|
||||
#ifndef AUTHORIZE_SERVER_NAME
|
||||
#define AUTHORIZE_SERVER_NAME "authorize.quake3arena.com"
|
||||
|
||||
#ifndef STANDALONE
|
||||
#ifndef AUTHORIZE_SERVER_NAME
|
||||
#define AUTHORIZE_SERVER_NAME "authorize.quake3arena.com"
|
||||
#endif
|
||||
#ifndef PORT_AUTHORIZE
|
||||
#define PORT_AUTHORIZE 27952
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#define PORT_MASTER 27950
|
||||
#define PORT_UPDATE 27951
|
||||
#ifndef PORT_AUTHORIZE
|
||||
#define PORT_AUTHORIZE 27952
|
||||
#endif
|
||||
#define PORT_SERVER 27960
|
||||
#define NUM_SERVER_PORTS 4 // broadcast scan this many ports after
|
||||
// PORT_SERVER so a single machine can
|
||||
|
|
|
|||
|
|
@ -290,7 +290,9 @@ void SV_GetChallenge( netadr_t from );
|
|||
|
||||
void SV_DirectConnect( netadr_t from );
|
||||
|
||||
#ifndef STANDALONE
|
||||
void SV_AuthorizeIpPacket( netadr_t from );
|
||||
#endif
|
||||
|
||||
void SV_ExecuteClientMessage( client_t *cl, msg_t *msg );
|
||||
void SV_UserinfoChanged( client_t *cl );
|
||||
|
|
|
|||
|
|
@ -397,6 +397,9 @@ static void SV_Kick_f( void ) {
|
|||
cl->lastPacketTime = svs.time; // in case there is a funny zombie
|
||||
}
|
||||
|
||||
#ifndef STANDALONE
|
||||
// these functions require the auth server which of course is not available anymore for stand-alone games.
|
||||
|
||||
/*
|
||||
==================
|
||||
SV_Ban_f
|
||||
|
|
@ -506,6 +509,7 @@ static void SV_BanNum_f( void ) {
|
|||
Com_Printf("%s was banned from coming back\n", cl->name);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
==================
|
||||
|
|
@ -735,8 +739,10 @@ void SV_AddOperatorCommands( void ) {
|
|||
|
||||
Cmd_AddCommand ("heartbeat", SV_Heartbeat_f);
|
||||
Cmd_AddCommand ("kick", SV_Kick_f);
|
||||
#ifndef STANDALONE
|
||||
Cmd_AddCommand ("banUser", SV_Ban_f);
|
||||
Cmd_AddCommand ("banClient", SV_BanNum_f);
|
||||
#endif
|
||||
Cmd_AddCommand ("clientkick", SV_KickNum_f);
|
||||
Cmd_AddCommand ("status", SV_Status_f);
|
||||
Cmd_AddCommand ("serverinfo", SV_Serverinfo_f);
|
||||
|
|
|
|||
|
|
@ -81,6 +81,10 @@ void SV_GetChallenge( netadr_t from ) {
|
|||
i = oldest;
|
||||
}
|
||||
|
||||
#ifdef STANDALONE
|
||||
challenge->pingTime = svs.time;
|
||||
NET_OutOfBandPrint( NS_SERVER, from, "challengeResponse %i", challenge->challenge );
|
||||
#else
|
||||
// if they are on a lan address, send the challengeResponse immediately
|
||||
if ( Sys_IsLANAddress( from ) ) {
|
||||
challenge->pingTime = svs.time;
|
||||
|
|
@ -144,8 +148,10 @@ void SV_GetChallenge( netadr_t from ) {
|
|||
NET_OutOfBandPrint( NS_SERVER, challenge->adr,
|
||||
"challengeResponse %i", challenge->challenge );
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifndef STANDALONE
|
||||
/*
|
||||
====================
|
||||
SV_AuthorizeIpPacket
|
||||
|
|
@ -216,6 +222,7 @@ void SV_AuthorizeIpPacket( netadr_t from ) {
|
|||
// clear the challenge record so it won't timeout and let them through
|
||||
Com_Memset( &svs.challenges[i], 0, sizeof( svs.challenges[i] ) );
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
==================
|
||||
|
|
@ -225,10 +232,6 @@ A "connect" OOB command has been received
|
|||
==================
|
||||
*/
|
||||
|
||||
#define PB_MESSAGE "PunkBuster Anti-Cheat software must be installed " \
|
||||
"and Enabled in order to join this server. An updated game patch can be downloaded from " \
|
||||
"www.idsoftware.com"
|
||||
|
||||
void SV_DirectConnect( netadr_t from ) {
|
||||
char userinfo[MAX_INFO_STRING];
|
||||
int i;
|
||||
|
|
|
|||
|
|
@ -534,8 +534,10 @@ void SV_ConnectionlessPacket( netadr_t from, msg_t *msg ) {
|
|||
SV_GetChallenge( from );
|
||||
} else if (!Q_stricmp(c, "connect")) {
|
||||
SV_DirectConnect( from );
|
||||
#ifndef STANDALONE
|
||||
} else if (!Q_stricmp(c, "ipAuthorize")) {
|
||||
SV_AuthorizeIpPacket( from );
|
||||
#endif
|
||||
} else if (!Q_stricmp(c, "rcon")) {
|
||||
SVC_RemoteCommand( from, msg );
|
||||
} else if (!Q_stricmp(c, "disconnect")) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue