[SCM] Quake 3 engine branch, master, updated. upstream/1.36+svn1788j-95-g4929855

[Simon McVittie]

The following commit has been merged in the master branch:
commit 49298559c9a6e27d3b3ce91047cf51e33ce343c9
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Nov 11 22:26:50 2010 +0000

    Add patch 0019: fix a regression in joining single-player team games

diff --git a/debian/changelog b/debian/changelog
index ced0e3a..feca198 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ioquake3 (1.36+svn1802-1) UNRELEASED; urgency=low
   * New upstream svn snapshot
     - Add patches 0017, 0018: revert r1796, which breaks Team Arena, and apply
       patch suggested by Zack Middleton instead
+    - Add patch 0019: fix a regression in joining single-player team games
   * Remove all of build/ in clean; otherwise architectures where uname -m
     doesn't match the Q3 architecture name won't delete the binaries
   * Use Q3 arch name "sh" for sh4
diff --git a/debian/patches/0019-Pass-client-commands-to-the-game-VM-in-PRIMED-as-wel.patch b/debian/patches/0019-Pass-client-commands-to-the-game-VM-in-PRIMED-as-wel.patch
new file mode 100644
index 0000000..ff949f1
--- /dev/null
+++ b/debian/patches/0019-Pass-client-commands-to-the-game-VM-in-PRIMED-as-wel.patch
@@ -0,0 +1,30 @@
+From f091549a0119e0777dab5008d502155668e0637b Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv at debian.org>
+Date: Thu, 11 Nov 2010 22:15:42 +0000
+Subject: [PATCH] Pass client commands to the game VM in PRIMED as well as ACTIVE state
+
+In single-player Team Arena, the player joins a team before they're
+ACTIVE.
+
+Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4629
+Forwarded: yes
+---
+ code/server/sv_client.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/code/server/sv_client.c b/code/server/sv_client.c
+index d6c355a..130cb62 100644
+--- a/code/server/sv_client.c
++++ b/code/server/sv_client.c
+@@ -1478,7 +1478,7 @@ void SV_ExecuteClientCommand( client_t *cl, const char *s, qboolean clientOK ) {
+ 
+ 	if (clientOK) {
+ 		// pass unknown strings to the game
+-		if (!u->name && sv.state == SS_GAME && cl->state == CS_ACTIVE) {
++		if (!u->name && sv.state == SS_GAME && (cl->state == CS_ACTIVE || cl->state == CS_PRIMED)) {
+ 			Cmd_Args_Sanitize();
+ 			VM_Call( gvm, GAME_CLIENT_COMMAND, cl - svs.clients );
+ 		}
+-- 
+1.7.2.3
+
diff --git a/debian/patches/series b/debian/patches/series
index 2a607a8..57c50ae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@
 0016-Fix-FTBFS-on-kFreeBSD.patch
 0017-Revert-Followup-to-4733.patch
 0018-Q3UI-clamp-gametype-to-not-overflow-gametype_remap2.patch
+0019-Pass-client-commands-to-the-game-VM-in-PRIMED-as-wel.patch

-- 
Quake 3 engine