rpms/openarena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5af1ebb4c4
openarena/oachanges.diff

197 lines
6.0 KiB
Diff
Raw Blame History

Index: q3_ui/ui_mods.c
===================================================================
--- q3_ui/ui_mods.c (revision 1107)
+++ q3_ui/ui_mods.c (working copy)
@@ -161,7 +161,7 @@
// always start off with baseq3
s_mods.list.numitems = 1;
- s_mods.list.itemnames[0] = s_mods.descriptionList[0] = "Quake III Arena";
+ s_mods.list.itemnames[0] = s_mods.descriptionList[0] = "OpenArena";
s_mods.fs_gameList[0] = "";
numdirs = trap_FS_GetFileList( "$modlist", "", dirlist, sizeof(dirlist) );
Index: server/sv_ccmds.c
===================================================================
--- server/sv_ccmds.c (revision 1107)
+++ server/sv_ccmds.c (working copy)
@@ -430,6 +430,12 @@
return;
}
+ if(strlen(AUTHORIZE_SERVER_NAME) < 1)
+ {
+ Com_Printf("Ban function disabled due to lack of authorizing server.\n");
+ return;
+ }
+
// look up the authorize server's IP
if ( !svs.authorizeAddress.ip[0] && svs.authorizeAddress.type != NA_BAD ) {
Com_Printf( "Resolving %s\n", AUTHORIZE_SERVER_NAME );
@@ -484,6 +490,12 @@
return;
}
+ if(strlen(AUTHORIZE_SERVER_NAME) < 1)
+ {
+ Com_Printf("Ban function disabled due to lack of authorizing server.\n");
+ return;
+ }
+
// look up the authorize server's IP
if ( !svs.authorizeAddress.ip[0] && svs.authorizeAddress.type != NA_BAD ) {
Com_Printf( "Resolving %s\n", AUTHORIZE_SERVER_NAME );
Index: server/sv_client.c
===================================================================
--- server/sv_client.c (revision 1107)
+++ server/sv_client.c (working copy)
@@ -88,6 +88,15 @@
return;
}
+ // if there's no authorize server defined, just let them in
+ if(strlen(AUTHORIZE_SERVER_NAME) < 1)
+ {
+ Com_Printf("Not authorizing client due to lack of auth server\n");
+ challenge->pingTime = svs.time;
+ NET_OutOfBandPrint( NS_SERVER, from, "challengeResponse %i", challenge->challenge );
+ return;
+ }
+
// look up the authorize server's IP
if ( !svs.authorizeAddress.ip[0] && svs.authorizeAddress.type != NA_BAD ) {
Com_Printf( "Resolving %s\n", AUTHORIZE_SERVER_NAME );
Index: qcommon/q_shared.h
===================================================================
--- qcommon/q_shared.h (revision 1107)
+++ qcommon/q_shared.h (working copy)
@@ -26,17 +26,17 @@
// q_shared.h -- included first by ALL program modules.
// A user mod should never modify this file
-#define Q3_VERSION "ioQ3 1.33"
+#define Q3_VERSION "ioQ3 1.33+oa"
#ifndef SVN_VERSION
#define SVN_VERSION Q3_VERSION
#endif
-#define CLIENT_WINDOW_TITLE "ioquake3"
-#define CLIENT_WINDOW_ICON "ioq3"
-#define CONSOLE_WINDOW_TITLE "ioquake3 console"
-#define CONSOLE_WINDOW_ICON "ioq3 console"
+#define CLIENT_WINDOW_TITLE "OpenArena"
+#define CLIENT_WINDOW_ICON "OpenArena"
+#define CONSOLE_WINDOW_TITLE "OpenArena console"
+#define CONSOLE_WINDOW_ICON "OpenArena console"
// 1.32 released 7-10-2002
-#define BASEGAME "baseq3"
+#define BASEGAME "baseoa"
#define MAX_TEAMNAME 32
Index: client/cl_main.c
===================================================================
--- client/cl_main.c (revision 1107)
+++ client/cl_main.c (working copy)
@@ -3582,7 +3582,7 @@
*/
qboolean CL_CDKeyValidate( const char *key, const char *checksum ) {
- char ch;
+/* char ch;
byte sum;
char chs[3];
int i, len;
@@ -3636,8 +3636,8 @@
if (!checksum) {
return qtrue;
}
-
- return qfalse;
+*/
+ return qtrue;
}
Index: qcommon/files.c
===================================================================
--- qcommon/files.c (revision 1107)
+++ qcommon/files.c (working copy)
@@ -2900,6 +2900,7 @@
*/
static void FS_CheckPak0( void )
{
+/*
searchpath_t *path;
qboolean founddemo = qfalse;
unsigned foundPak = 0;
@@ -2972,6 +2973,7 @@
|| !Q_stricmp( fs_gamedirvar->string, "missionpack" ))
Com_Error(ERR_FATAL, "\n*** you need to install Quake III Arena in order to play ***");
}
+*/
}
/*
@@ -3383,7 +3385,7 @@
// try to start up normally
FS_Startup( BASEGAME );
- FS_CheckPak0( );
+ // FS_CheckPak0( );
// if we can't find default.cfg, assume that the paths are
// busted and error out now, rather than getting an unreadable
Index: qcommon/qcommon.h
===================================================================
--- qcommon/qcommon.h (revision 1107)
+++ qcommon/qcommon.h (working copy)
@@ -236,10 +236,10 @@
#define UPDATE_SERVER_NAME "update.quake3arena.com"
// override on command line, config files etc.
#ifndef MASTER_SERVER_NAME
-#define MASTER_SERVER_NAME "master.quake3arena.com"
+#define MASTER_SERVER_NAME "dpmaster.deathmask.net"
#endif
#ifndef AUTHORIZE_SERVER_NAME
-#define AUTHORIZE_SERVER_NAME "authorize.quake3arena.com"
+#define AUTHORIZE_SERVER_NAME ""
#endif
#define PORT_MASTER 27950
Index: ui/ui_main.c
===================================================================
--- ui/ui_main.c (revision 1107)
+++ ui/ui_main.c (working copy)
@@ -64,7 +64,7 @@
static const serverFilter_t serverFilters[] = {
{"All", "" },
- {"Quake 3 Arena", "" },
+ {"OpenArena", "" },
{"Team Arena", "missionpack" },
{"Rocket Arena", "arena" },
{"Alliance", "alliance20" },
Index: client/snd_dma.c
===================================================================
--- client/snd_dma.c (revision 1107)
+++ client/snd_dma.c (working copy)
@@ -364,7 +364,7 @@
Com_Memset( s_knownSfx, 0, sizeof( s_knownSfx ) );
Com_Memset(sfxHash, 0, sizeof(sfx_t *)*LOOP_HASH);
- S_Base_RegisterSound("sound/feedback/hit.wav", qfalse); // changed to a sound in baseq3
+ S_Base_RegisterSound("sound/misc/silence.wav", qfalse); // changed to a sound in baseq3
}
}
Index: client/snd_openal.c
===================================================================
--- client/snd_openal.c (revision 1107)
+++ client/snd_openal.c (working copy)
@@ -384,7 +384,7 @@
numSfx = 0;
// Load the default sound, and lock it
- default_sfx = S_AL_BufferFind("sound/feedback/hit.wav");
+ default_sfx = S_AL_BufferFind("sound/misc/silence.wav");
S_AL_BufferUse(default_sfx);
knownSfx[default_sfx].isLocked = qtrue;
Reference in New Issue View Git Blame Copy Permalink