[SCM] Packaging for the OpenArena engine branch, master, updated. debian/0.8.5-2-2-g3748228

[Simon McVittie]

The following commit has been merged in the master branch:
commit 37482286ffb388381a0dc02a80c57c40a62ecf2f
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Aug 7 00:42:43 2010 +0100

    Add patch from oax r203 to fix server crashes if a client joins then rapidly leaves

diff --git a/debian/changelog b/debian/changelog
index 2fd529b..9057971 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openarena (0.8.5-3) UNRELEASED; urgency=low
+
+  * Add patch from oax r203 to fix server crashes if a player joins, then
+    rapidly leaves or dies (Closes: #592020)
+
+ -- Simon McVittie <smcv at debian.org>  Sat, 07 Aug 2010 00:04:45 +0100
+
 openarena (0.8.5-2) unstable; urgency=low
 
   [ Simon McVittie ]
diff --git a/debian/patches/0039-Used-self-enemy-before-it-was-initialized.-Might-hav.patch b/debian/patches/0039-Used-self-enemy-before-it-was-initialized.-Might-hav.patch
new file mode 100644
index 0000000..2a72939
--- /dev/null
+++ b/debian/patches/0039-Used-self-enemy-before-it-was-initialized.-Might-hav.patch
@@ -0,0 +1,27 @@
+From: sago007 <unknown>
+Date: Thu, 29 Apr 2010 16:02:53 +0000
+Subject: [PATCH] Used self->enemy before it was initialized. Might have resultet in the TEAMKILL thing
+
+[This fixes a server crash when a client joins and then rapidly leaves, when
+using native code instead of QVMs. -smcv]
+
+Origin: upstream, oax commit:203
+Bug-Debian: http://bugs.debian.org/592020
+git-svn-id: http://oax.googlecode.com/svn/trunk@203 48ef5666-4144-11de-b6cc-f32266f7ba4a
+---
+ game/code/game/g_combat.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/game/code/game/g_combat.c b/game/code/game/g_combat.c
+index f2185e6..8c81284 100644
+--- a/game/code/game/g_combat.c
++++ b/game/code/game/g_combat.c
+@@ -526,7 +526,7 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
+ 	ent->s.otherEntityNum = self->s.number;
+ 	ent->s.otherEntityNum2 = killer;
+         //Sago: Hmmm... generic? Can I transmit anything I like? Like if it is a team kill? Let's try
+-        ent->s.generic1 = OnSameTeam (self, self->enemy);
++        ent->s.generic1 = OnSameTeam (self, attacker);
+         if( !((g_gametype.integer==GT_ELIMINATION || g_gametype.integer==GT_CTF_ELIMINATION) && level.time < level.roundStartTime) )
+             ent->r.svFlags = SVF_BROADCAST;	// send to everyone (if not an elimination gametype during active warmup)
+         else
diff --git a/debian/patches/series b/debian/patches/series
index 214d351..4f37be5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -30,3 +30,4 @@
 0036-Add-error-markers-to-sources-in-the-mod-SDK-that-are.patch
 0037-Put-a-error-marker-in-engine-s-ui_shared.h-to-make-s.patch
 0038-Fix-buffer-overflow-report-and-patch-by-Eugene-C.-46.patch
+0039-Used-self-enemy-before-it-was-initialized.-Might-hav.patch

-- 
Packaging for the OpenArena engine