[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 325fc73124b05f830a0f134e0527e5e3b6e70ca2
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Feb 4 20:26:46 2011 +0000

    More upstreamed patches

diff --git a/debian/patches/0017-Revert-Followup-to-4733.patch b/debian/patches/0017-Revert-Followup-to-4733.patch
index 44b9488..88c45d4 100644
--- a/debian/patches/0017-Revert-Followup-to-4733.patch
+++ b/debian/patches/0017-Revert-Followup-to-4733.patch
@@ -5,9 +5,8 @@ Subject: [PATCH 1/2] Revert "Followup to #4733"
 
 This reverts commit e996b2d93708d1176f80fb6e86812576cf8b6e7a.
 Zack Middleton points out that it'd break missionpack.
----
- code/game/bg_public.h |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+
+Applied-upstream: 1.37, commit:1845
 
 diff --git a/code/game/bg_public.h b/code/game/bg_public.h
 index 6376b5c..ad5ab39 100644
@@ -26,6 +25,3 @@ index 6376b5c..ad5ab39 100644
  } gametype_t;
  
  typedef enum { GENDER_MALE, GENDER_FEMALE, GENDER_NEUTER } gender_t;
--- 
-1.7.2.3
-
diff --git a/debian/patches/0018-Q3UI-clamp-gametype-to-not-overflow-gametype_remap2.patch b/debian/patches/0018-Q3UI-clamp-gametype-to-not-overflow-gametype_remap2.patch
index 698fbca..f89a320 100644
--- a/debian/patches/0018-Q3UI-clamp-gametype-to-not-overflow-gametype_remap2.patch
+++ b/debian/patches/0018-Q3UI-clamp-gametype-to-not-overflow-gametype_remap2.patch
@@ -4,23 +4,19 @@ Date: Thu, 11 Nov 2010 19:18:31 +0000
 Subject: [PATCH 2/2] Q3UI: clamp gametype to not overflow gametype_remap2
 
 Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4733
----
- code/q3_ui/ui_startserver.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+Applied-upstream: 1.37, commit:1845
 
 diff --git a/code/q3_ui/ui_startserver.c b/code/q3_ui/ui_startserver.c
-index 39b2c7f..3ba9db2 100644
+index 39b2c7f..4230dc3 100644
 --- a/code/q3_ui/ui_startserver.c
 +++ b/code/q3_ui/ui_startserver.c
-@@ -1239,7 +1239,7 @@ static void ServerOptions_MenuInit( qboolean multiplayer ) {
+@@ -1239,7 +1239,8 @@ static void ServerOptions_MenuInit( qboolean multiplayer ) {
  
  	memset( &s_serveroptions, 0 ,sizeof(serveroptions_t) );
  	s_serveroptions.multiplayer = multiplayer;
 -	s_serveroptions.gametype = (int)Com_Clamp( 0, GT_MAX_GAME_TYPE - 1, trap_Cvar_VariableValue( "g_gameType" ) );
-+	s_serveroptions.gametype = (int)Com_Clamp( 0, ARRAY_LEN(gametype_remap2) - 1, trap_Cvar_VariableValue( "g_gameType" ) );
++	s_serveroptions.gametype = (int) Com_Clamp(0, ARRAY_LEN(gametype_remap2) - 1,
++						trap_Cvar_VariableValue("g_gametype"));
  	s_serveroptions.punkbuster.curvalue = Com_Clamp( 0, 1, trap_Cvar_VariableValue( "sv_punkbuster" ) );
  
  	ServerOptions_Cache();
--- 
-1.7.2.3
-

-- 
Quake 3 engine