[SCM] Quake 3 engine branch, master, updated. debian/1.36+svn1802-2+dbg-12-ga1a81c1

[Simon McVittie]

The following commit has been merged in the master branch:
commit 25f8b477e90907ad117cf4c017938e0e11a1dc60
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Feb 4 23:35:03 2011 +0000

    add patch 0015: openarena in experimental relies on being able to set com_standalone 1 on the command line, so bring back that functionality, and copy com_basegame from fs_basegame if used

diff --git a/debian/changelog b/debian/changelog
index c2d515a..6d3ab13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ ioquake3 (1.36+svn1858-1) UNRELEASED; urgency=low
   * New upstream release
     - discard patches that were applied or replaced upstream
     - refresh remaining patches
+    - add patch 0015: openarena in experimental relies on being able to set
+      com_standalone 1 on the command line, so bring back that functionality,
+      and copy com_basegame from fs_basegame if used
 
  -- Simon McVittie <smcv at debian.org>  Fri, 04 Feb 2011 20:15:33 +0000
 
diff --git a/debian/patches/0015-Set-com_basegame-from-fs_basegame-if-com_standalone-.patch b/debian/patches/0015-Set-com_basegame-from-fs_basegame-if-com_standalone-.patch
new file mode 100644
index 0000000..d3add14
--- /dev/null
+++ b/debian/patches/0015-Set-com_basegame-from-fs_basegame-if-com_standalone-.patch
@@ -0,0 +1,49 @@
+From 9e24ed84d2807ee9d8135a689e44bafd9aced7da Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv at debian.org>
+Date: Fri, 4 Feb 2011 23:32:30 +0000
+Subject: [PATCH] Set com_basegame from fs_basegame if com_standalone is set on command line
+
+This is how the previous Debian patch for
+http://bugzilla.icculus.org/show_bug.cgi?id=4699 worked; we can remove
+it when we no longer care about openarena 0.8.5-5+exp[1-3] from
+experimental.
+
+Forwarded: not-needed
+---
+ code/qcommon/common.c |   20 ++++++++++++++++++--
+ 1 files changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/code/qcommon/common.c b/code/qcommon/common.c
+index 73e82fb..c9814b1 100644
+--- a/code/qcommon/common.c
++++ b/code/qcommon/common.c
+@@ -2623,8 +2623,24 @@ void Com_Init( char *commandLine ) {
+ 	// done early so bind command exists
+ 	CL_InitKeyCommands();
+ 
+-	com_standalone = Cvar_Get("com_standalone", "0", CVAR_ROM);
+-	com_basegame = Cvar_Get("com_basegame", BASEGAME, CVAR_INIT);
++	// Debian-specific: return com_standalone to CVAR_INIT for
++	// compatibility with OA 0.8.5-5+exp[1-3]
++	com_standalone = Cvar_Get("com_standalone", "0", CVAR_INIT);
++	if (com_standalone->integer)
++	{
++		cvar_t *tmp = Cvar_Get("fs_basegame", "", CVAR_INIT);
++
++		if (tmp->string[0])
++		{
++			Com_Printf( "Switching default com_basegame to fs_basegame %s (this won't work forever)\n", tmp->string );
++			com_basegame = Cvar_Get("com_basegame", tmp->string, CVAR_INIT);
++		}
++	}
++	else
++	{
++		com_basegame = Cvar_Get("com_basegame", BASEGAME, CVAR_INIT);
++	}
++
+ 	com_homepath = Cvar_Get("com_homepath", "", CVAR_INIT);
+ 	
+ 	if(!com_basegame->string[0])
+-- 
+1.7.2.3
+
diff --git a/debian/patches/series b/debian/patches/series
index c96893a..730f9c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
 0012-Increase-the-command-buffer-from-16K-to-128K-followi.patch
 0013-Double-the-default-com_hunkMegs-to-128M.patch
 0014-Put-g_humanplayers-and-g_needpass-in-server-info.patch
+0015-Set-com_basegame-from-fs_basegame-if-com_standalone-.patch

-- 
Quake 3 engine