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

Simon McVittie smcv at debian.org
Thu Nov 11 22:48:33 UTC 2010


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

    Add patches 0017, 0018: revert r1796, which breaks Team Arena, and apply patch suggested by Zack Middleton instead

diff --git a/debian/changelog b/debian/changelog
index 5c2d4b7..34d48a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 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
   * 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/0017-Revert-Followup-to-4733.patch b/debian/patches/0017-Revert-Followup-to-4733.patch
new file mode 100644
index 0000000..44b9488
--- /dev/null
+++ b/debian/patches/0017-Revert-Followup-to-4733.patch
@@ -0,0 +1,31 @@
+From 65158bf14f43161e5fcd28efb1c1d5fcb0db8f1d Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv at debian.org>
+Date: Thu, 11 Nov 2010 19:15:44 +0000
+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(-)
+
+diff --git a/code/game/bg_public.h b/code/game/bg_public.h
+index 6376b5c..ad5ab39 100644
+--- a/code/game/bg_public.h
++++ b/code/game/bg_public.h
+@@ -103,10 +103,10 @@ typedef enum {
+ 
+ 	GT_TEAM,			// team deathmatch
+ 	GT_CTF,				// capture the flag
+-	GT_MAX_GAME_TYPE,		// other gametypes haven't been implemented.
+ 	GT_1FCTF,
+ 	GT_OBELISK,
+-	GT_HARVESTER
++	GT_HARVESTER,
++	GT_MAX_GAME_TYPE
+ } 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
new file mode 100644
index 0000000..698fbca
--- /dev/null
+++ b/debian/patches/0018-Q3UI-clamp-gametype-to-not-overflow-gametype_remap2.patch
@@ -0,0 +1,26 @@
+From d52094c72e51332c64241751708c55b6e5e22cf5 Mon Sep 17 00:00:00 2001
+From: Zack Middleton <ZTurtleMan gmail com>
+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(-)
+
+diff --git a/code/q3_ui/ui_startserver.c b/code/q3_ui/ui_startserver.c
+index 39b2c7f..3ba9db2 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 ) {
+ 
+ 	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.punkbuster.curvalue = Com_Clamp( 0, 1, trap_Cvar_VariableValue( "sv_punkbuster" ) );
+ 
+ 	ServerOptions_Cache();
+-- 
+1.7.2.3
+
diff --git a/debian/patches/series b/debian/patches/series
index a90f27f..2a607a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,5 @@
 0014-Put-g_humanplayers-and-g_needpass-in-server-info.patch
 0015-Fix-spelling-error.patch
 0016-Fix-FTBFS-on-kFreeBSD.patch
+0017-Revert-Followup-to-4733.patch
+0018-Q3UI-clamp-gametype-to-not-overflow-gametype_remap2.patch

-- 
Quake 3 engine



More information about the Pkg-games-commits mailing list