rpms/quake3/devel quake3-1.34-configurable-client-masterserver.patch, NONE, 1.1 quake3-1.34-dont-ask-openarena-cdkey.patch, NONE, 1.1 quake3-1.34-fix-empty-fs_game-from-server.patch, NONE, 1.1 quake3-1.34-no-pak0-check.patch, NONE, 1.1 quake3.spec, 1.4, 1.5 urbanterror.sh, 1.2, 1.3
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Fri Jan 11 16:26:47 UTC 2008
Author: jwrdegoede
Update of /cvs/extras/rpms/quake3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8634
Modified Files:
quake3.spec urbanterror.sh
Added Files:
quake3-1.34-configurable-client-masterserver.patch
quake3-1.34-dont-ask-openarena-cdkey.patch
quake3-1.34-fix-empty-fs_game-from-server.patch
quake3-1.34-no-pak0-check.patch
Log Message:
* Fri Jan 11 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.34-0.7.rc4
- Various patches to make openarena work with the generic ioquake3 we ship
- Update urbanterror launcher script to set a much bigger com_hunkMegs,
otherwise urbanterror will abort when loading bigger levels
quake3-1.34-configurable-client-masterserver.patch:
--- NEW FILE quake3-1.34-configurable-client-masterserver.patch ---
--- /trunk/code/client/cl_main.c 2007/11/13 16:37:41 1211
+++ trunk/code/client/cl_main.c 2007/11/14 19:04:12 1212
@@ -36,6 +36,7 @@
cvar_t *cl_timeout;
cvar_t *cl_maxpackets;
cvar_t *cl_packetdup;
+cvar_t *cl_master;
cvar_t *cl_timeNudge;
cvar_t *cl_showTimeDelta;
cvar_t *cl_freezeDemo;
@@ -2665,6 +2666,7 @@
cl_timeout = Cvar_Get ("cl_timeout", "200", 0);
+ cl_master = Cvar_Get ("cl_master", MASTER_SERVER_NAME, CVAR_ARCHIVE);
cl_timeNudge = Cvar_Get ("cl_timeNudge", "0", CVAR_TEMP );
cl_shownet = Cvar_Get ("cl_shownet", "0", CVAR_TEMP );
cl_showSend = Cvar_Get ("cl_showSend", "0", CVAR_TEMP );
@@ -3269,12 +3271,12 @@
// -1 is used to distinguish a "no response"
if( cls.masterNum == 1 ) {
- NET_StringToAdr( MASTER_SERVER_NAME, &to );
+ NET_StringToAdr( cl_master->string, &to );
cls.nummplayerservers = -1;
cls.pingUpdateSource = AS_MPLAYER;
}
else {
- NET_StringToAdr( MASTER_SERVER_NAME, &to );
+ NET_StringToAdr( cl_master->string, &to );
cls.numglobalservers = -1;
cls.pingUpdateSource = AS_GLOBAL;
}
quake3-1.34-dont-ask-openarena-cdkey.patch:
--- NEW FILE quake3-1.34-dont-ask-openarena-cdkey.patch ---
--- quake3-1.34-rc4/code/client/cl_main.c 2008-01-11 17:04:56.000000000 +0100
+++ quake3.new/code/client/cl_main.c 2008-01-11 16:54:33.000000000 +0100
@@ -3588,6 +3588,14 @@
byte sum;
char chs[3];
int i, len;
+ cvar_t *fs_gamedirvar;
+
+ /* Hackety hackety hack, openarena for some reason contains a check
+ for a CD-key in its menu code <sigh>, so if were running openarena
+ always return true */
+ fs_gamedirvar = Cvar_Get ("fs_game", "", CVAR_INIT|CVAR_SYSTEMINFO );
+ if (!strcmp(fs_gamedirvar->string, "baseoa"))
+ return qtrue;
len = strlen(key);
if( len != CDKEY_LEN ) {
quake3-1.34-fix-empty-fs_game-from-server.patch:
--- NEW FILE quake3-1.34-fix-empty-fs_game-from-server.patch ---
diff -up quake3-1.34-rc4/code/qcommon/files.c~ quake3-1.34-rc4/code/qcommon/files.c
--- quake3-1.34-rc4/code/qcommon/files.c~ 2008-01-11 15:44:10.000000000 +0100
+++ quake3-1.34-rc4/code/qcommon/files.c 2008-01-11 15:44:10.000000000 +0100
@@ -3279,6 +3279,11 @@ void FS_Restart( int checksumFeed ) {
// clear pak references
FS_ClearPakReferences(0);
+
+ // some servers don't set fs_game even though they should (openarena)
+ // so if fs_game is unset here, use the one set from the cmdline
+ if (!fs_gamedirvar->string[0])
+ Com_StartupVariable( "fs_game" );
// try to start up normally
FS_Startup( BASEGAME );
quake3-1.34-no-pak0-check.patch:
--- NEW FILE quake3-1.34-no-pak0-check.patch ---
--- quake3-1.34-rc4/code/qcommon/files.c~ 2008-01-11 17:11:00.000000000 +0100
+++ quake3-1.34-rc4/code/qcommon/files.c 2008-01-11 17:11:00.000000000 +0100
@@ -2903,6 +2903,13 @@ static void FS_CheckPak0( void )
searchpath_t *path;
qboolean founddemo = qfalse;
unsigned foundPak = 0;
+
+ /* A bit hacky, but we don't want to complain about pak0 when running
+ totalconversions, so skip the check for known total conversions */
+ if ( !strcmp(fs_gamedirvar->string, "baseoa") ||
+ !strcmp(fs_gamedirvar->string, "q3ut4") ||
+ !strcmp(fs_gamedirvar->string, "wop"))
+ return;
for( path = fs_searchpaths; path; path = path->next ) {
const char* pakBasename = path->pack->pakBasename;
Index: quake3.spec
===================================================================
RCS file: /cvs/extras/rpms/quake3/devel/quake3.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- quake3.spec 23 Dec 2007 18:53:49 -0000 1.4
+++ quake3.spec 11 Jan 2008 16:26:10 -0000 1.5
@@ -2,7 +2,7 @@
Name: quake3
Version: 1.34
-Release: 0.6.%{prever}%{?dist}
+Release: 0.7.%{prever}%{?dist}
Summary: Quake 3 Arena engine (ioquake3 version)
Group: Amusements/Games
License: GPLv2+
@@ -31,7 +31,11 @@
Source12: worldofpadman.autodlrc
Source13: worldofpadman.desktop
Source14: wop.png
-Patch0: %{name}-1.34-syslibs.patch
+Patch0: quake3-1.34-syslibs.patch
+Patch1: quake3-1.34-configurable-client-masterserver.patch
+Patch2: quake3-1.34-fix-empty-fs_game-from-server.patch
+Patch3: quake3-1.34-dont-ask-openarena-cdkey.patch
+Patch4: quake3-1.34-no-pak0-check.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel libXt-devel openal-devel libjpeg-devel
BuildRequires: libvorbis-devel curl-devel desktop-file-utils
@@ -128,7 +132,11 @@
%prep
%setup -q -n %{name}-%{version}-%{prever}
-%patch0 -p1 -b .syslibs
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
%build
@@ -261,6 +269,11 @@
%changelog
+* Fri Jan 11 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.34-0.7.rc4
+- Various patches to make openarena work with the generic ioquake3 we ship
+- Update urbanterror launcher script to set a much bigger com_hunkMegs,
+ otherwise urbanterror will abort when loading bigger levels
+
* Sun Dec 23 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.34-0.6.rc4
- Update urbanterror autodlrc file to refer to version 4.1 (was 4.0)
Index: urbanterror.sh
===================================================================
RCS file: /cvs/extras/rpms/quake3/devel/urbanterror.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- urbanterror.sh 23 Dec 2007 18:53:49 -0000 1.2
+++ urbanterror.sh 11 Jan 2008 16:26:10 -0000 1.3
@@ -26,4 +26,4 @@
fi
fi
-exec quake3 +set fs_game q3ut4 "$@"
+exec quake3 +set fs_game q3ut4 +set com_hunkMegs 256 "$@"
More information about the fedora-extras-commits
mailing list