From d4ea8e455ed4a18da6bc34775c7845cfbabdd31c Mon Sep 17 00:00:00 2001
From: Richard Allen <ra@ra.is>
Date: Sat, 11 May 2002 15:00:04 +0000
Subject: [PATCH] Fix for autojoin and a very minir for for Obits

---
 reaction/game/g_combat.c  | 4 ++++
 reaction/game/g_session.c | 9 ++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/reaction/game/g_combat.c b/reaction/game/g_combat.c
index 362db8cf..a0286d34 100644
--- a/reaction/game/g_combat.c
+++ b/reaction/game/g_combat.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.71  2002/05/11 15:00:04  jbravo
+// Fix for autojoin and a very minir for for Obits
+//
 // Revision 1.70  2002/05/10 08:10:18  jbravo
 // Fixed a bug in the Obit system and a give (weapons or all) bug
 //
@@ -939,6 +942,7 @@ void PrintDeathMessage (gentity_t *target, gentity_t *attacker, int location, in
 					default:
 						Q_strncpyz (message, " was sniped by", sizeof(message));
 				}
+				break;
 			case MOD_AKIMBO:
 				switch (location) {
 					case LOC_HDAM:
diff --git a/reaction/game/g_session.c b/reaction/game/g_session.c
index 000f3416..9d72a670 100644
--- a/reaction/game/g_session.c
+++ b/reaction/game/g_session.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.15  2002/05/11 15:00:04  jbravo
+// Fix for autojoin and a very minir for for Obits
+//
 // Revision 1.14  2002/05/05 15:51:16  slicer
 // Captain and subs get saved on map_restarts ( moved to "sess" )
 //
@@ -174,7 +177,11 @@ void G_InitSessionData( gclient_t *client, char *userinfo ) {
 	// initial team determination
 	if ( g_gametype.integer >= GT_TEAM ) {
 		if ( g_teamAutoJoin.integer ) {
-			sess->sessionTeam = PickTeam( -1 );
+			if (g_gametype.integer == GT_TEAMPLAY) {
+				sess->savedTeam = PickTeam( -1 );
+				client->ps.persistant[PERS_SAVEDTEAM] = sess->savedTeam;
+			} else
+				sess->sessionTeam = PickTeam( -1 );
 			BroadcastTeamChange( client, -1 );
 		} else {
 			// always spawn as spectator in team games