[SCM] Packaging for the OpenArena engine branch, master, updated. debian/0.8.1-8-48-g9372e3f

[Simon McVittie]

The following commit has been merged in the master branch:
commit 7b51d963e4054fb106172cd869dd68c512e55138
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Jul 29 03:58:48 2010 +0100

    Replace OA patch for (ROM & ARCHIVE) cvars with a bugfix from ioquake3
    
    The ioquake3 bugfix has the advantage of a comment explaining what's
    going on.

diff --git a/debian/patches/0021-bug-4357-CVAR_ROM-CVAR_ARCHIVE-is-not-read-from-q3co.patch b/debian/patches/0021-bug-4357-CVAR_ROM-CVAR_ARCHIVE-is-not-read-from-q3co.patch
new file mode 100644
index 0000000..a7dbbed
--- /dev/null
+++ b/debian/patches/0021-bug-4357-CVAR_ROM-CVAR_ARCHIVE-is-not-read-from-q3co.patch
@@ -0,0 +1,86 @@
+From: Tim Angus <unknown>
+Date: Sun, 3 Jan 2010 19:44:37 +0000
+Subject: [PATCH] * (bug #4357) CVAR_ROM+CVAR_ARCHIVE is not read from q3config
+
+[OpenArena's engine has another patch with the same practical effect. -smcv]
+
+Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4357
+Origin: upstream, svn://svn.icculus.org/quake3/trunk@1760
+git-svn-id: svn://svn.icculus.org/quake3/trunk@1760 edf5b092-35ff-0310-97b2-ce42778d08ea
+---
+ code/q3_ui/ui_main.c |   14 +++++++-------
+ code/qcommon/cvar.c  |    7 +++++++
+ code/ui/ui_main.c    |   14 +++++++-------
+ 3 files changed, 21 insertions(+), 14 deletions(-)
+
+diff --git a/engine/code/q3_ui/ui_main.c b/engine/code/q3_ui/ui_main.c
+index 8ec498d..9876b92 100644
+--- a/engine/code/q3_ui/ui_main.c
++++ b/engine/code/q3_ui/ui_main.c
+@@ -174,13 +174,13 @@ static cvarTable_t		cvarTable[] = {
+ 
+ 	{ &ui_arenasFile, "g_arenasFile", "", CVAR_INIT|CVAR_ROM },
+ 	{ &ui_botsFile, "g_botsFile", "", CVAR_INIT|CVAR_ROM },
+-	{ &ui_spScores1, "g_spScores1", "", CVAR_ARCHIVE | CVAR_ROM },
+-	{ &ui_spScores2, "g_spScores2", "", CVAR_ARCHIVE | CVAR_ROM },
+-	{ &ui_spScores3, "g_spScores3", "", CVAR_ARCHIVE | CVAR_ROM },
+-	{ &ui_spScores4, "g_spScores4", "", CVAR_ARCHIVE | CVAR_ROM },
+-	{ &ui_spScores5, "g_spScores5", "", CVAR_ARCHIVE | CVAR_ROM },
+-	{ &ui_spAwards, "g_spAwards", "", CVAR_ARCHIVE | CVAR_ROM },
+-	{ &ui_spVideos, "g_spVideos", "", CVAR_ARCHIVE | CVAR_ROM },
++	{ &ui_spScores1, "g_spScores1", "", CVAR_ARCHIVE },
++	{ &ui_spScores2, "g_spScores2", "", CVAR_ARCHIVE },
++	{ &ui_spScores3, "g_spScores3", "", CVAR_ARCHIVE },
++	{ &ui_spScores4, "g_spScores4", "", CVAR_ARCHIVE },
++	{ &ui_spScores5, "g_spScores5", "", CVAR_ARCHIVE },
++	{ &ui_spAwards, "g_spAwards", "", CVAR_ARCHIVE },
++	{ &ui_spVideos, "g_spVideos", "", CVAR_ARCHIVE },
+ 	{ &ui_spSkill, "g_spSkill", "2", CVAR_ARCHIVE | CVAR_LATCH },
+ 
+ 	{ &ui_spSelection, "ui_spSelection", "", CVAR_ROM },
+diff --git a/engine/code/qcommon/cvar.c b/engine/code/qcommon/cvar.c
+index 8bd1b27..06e7723 100644
+--- a/engine/code/qcommon/cvar.c
++++ b/engine/code/qcommon/cvar.c
+@@ -1164,6 +1164,13 @@ void Cvar_Register(vmCvar_t *vmCvar, const char *varName, const char *defaultVal
+ {
+ 	cvar_t	*cv;
+ 
++	// There is code in Cvar_Get to prevent CVAR_ROM cvars being changed by the
++	// user. In other words CVAR_ARCHIVE and CVAR_ROM are mutually exclusive
++	// flags. Unfortunately some historical game code (including single player
++	// baseq3) sets both flags. We unset CVAR_ROM for such cvars.
++	if ((flags & (CVAR_ARCHIVE | CVAR_ROM)) == (CVAR_ARCHIVE | CVAR_ROM))
++		flags &= ~CVAR_ROM;
++
+ 	cv = Cvar_Get(varName, defaultValue, flags | CVAR_VM_CREATED);
+ 
+ 	if (!vmCvar)
+diff --git a/engine/code/ui/ui_main.c b/engine/code/ui/ui_main.c
+index 6c9fb6e..1d120a7 100644
+--- a/engine/code/ui/ui_main.c
++++ b/engine/code/ui/ui_main.c
+@@ -5709,13 +5709,13 @@ static cvarTable_t		cvarTable[] = {
+ 
+ 	{ &ui_arenasFile, "g_arenasFile", "", CVAR_INIT|CVAR_ROM },
+ 	{ &ui_botsFile, "g_botsFile", "", CVAR_INIT|CVAR_ROM },
+-	{ &ui_spScores1, "g_spScores1", "", CVAR_ARCHIVE | CVAR_ROM },
+-	{ &ui_spScores2, "g_spScores2", "", CVAR_ARCHIVE | CVAR_ROM },
+-	{ &ui_spScores3, "g_spScores3", "", CVAR_ARCHIVE | CVAR_ROM },
+-	{ &ui_spScores4, "g_spScores4", "", CVAR_ARCHIVE | CVAR_ROM },
+-	{ &ui_spScores5, "g_spScores5", "", CVAR_ARCHIVE | CVAR_ROM },
+-	{ &ui_spAwards, "g_spAwards", "", CVAR_ARCHIVE | CVAR_ROM },
+-	{ &ui_spVideos, "g_spVideos", "", CVAR_ARCHIVE | CVAR_ROM },
++	{ &ui_spScores1, "g_spScores1", "", CVAR_ARCHIVE },
++	{ &ui_spScores2, "g_spScores2", "", CVAR_ARCHIVE },
++	{ &ui_spScores3, "g_spScores3", "", CVAR_ARCHIVE },
++	{ &ui_spScores4, "g_spScores4", "", CVAR_ARCHIVE },
++	{ &ui_spScores5, "g_spScores5", "", CVAR_ARCHIVE },
++	{ &ui_spAwards, "g_spAwards", "", CVAR_ARCHIVE },
++	{ &ui_spVideos, "g_spVideos", "", CVAR_ARCHIVE },
+ 	{ &ui_spSkill, "g_spSkill", "2", CVAR_ARCHIVE },
+ 
+ 	{ &ui_spSelection, "ui_spSelection", "", CVAR_ROM },
+-- 
+1.7.1
+
diff --git a/debian/patches/series b/debian/patches/series
index c41e6f0..829f0d0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,7 +15,7 @@
 0018-Change-to-protocol-71-OpenArena-0.8.1-with-support-f.patch
 0019-Allow-the-server-to-set-sv_fps-pmove_fixed-pmove_mse.patch
 0020-Increase-default-com_hunkmegs-to-128M.patch
-0021-Change-semantics-of-CVAR_ROM-CVAR_ARCHIVE-cvars.patch
+0021-bug-4357-CVAR_ROM-CVAR_ARCHIVE-is-not-read-from-q3co.patch
 0022-Turn-FS_CheckPak0-into-a-stub.patch
 0023-Knock-out-the-update-server.patch
 0024-Use-the-OpenArena-master-server.patch
diff --git a/debian/patches/0021-Change-semantics-of-CVAR_ROM-CVAR_ARCHIVE-cvars.patch b/debian/unapplied/0021-Change-semantics-of-CVAR_ROM-CVAR_ARCHIVE-cvars.patch
similarity index 100%
rename from debian/patches/0021-Change-semantics-of-CVAR_ROM-CVAR_ARCHIVE-cvars.patch
rename to debian/unapplied/0021-Change-semantics-of-CVAR_ROM-CVAR_ARCHIVE-cvars.patch

-- 
Packaging for the OpenArena engine