From 3662bf8a15f1f2bed0dd34a14528a6dc06bc12e0 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Thu, 16 Sep 2010 06:51:42 +0000
Subject: [PATCH] - reverted r2783 because it was causing problems.

SVN r2792 (trunk)
---
 src/g_game.cpp | 5 +----
 src/p_pspr.cpp | 6 ------
 src/p_user.cpp | 5 +----
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/g_game.cpp b/src/g_game.cpp
index cd9cd6f4ad..caf43cd6f0 100644
--- a/src/g_game.cpp
+++ b/src/g_game.cpp
@@ -1345,10 +1345,7 @@ void G_PlayerReborn (int player)
 	if (gamestate != GS_TITLELEVEL)
 	{
 		actor->GiveDefaultInventory ();
-
-		// [Spleen] ReadyWeapon will be set when P_MovePsprites calls P_BringUpWeapon
-		p->ReadyWeapon = NULL;
-		//p->ReadyWeapon = p->PendingWeapon;
+		p->ReadyWeapon = p->PendingWeapon;
 	}
 
     //Added by MC: Init bot structure.
diff --git a/src/p_pspr.cpp b/src/p_pspr.cpp
index 0a9e3eb4e8..a30e2d7360 100644
--- a/src/p_pspr.cpp
+++ b/src/p_pspr.cpp
@@ -794,15 +794,9 @@ void P_SetupPsprites(player_t *player)
 	{
 		player->psprites[i].state = NULL;
 	}
-
-
-	// [Spleen] Let P_MovePsprites handle calling P_BringUpWeapon,
-	// instead of P_SetupPsprites, to avoid raising it twice in one tic.
-	/*
 	// Spawn the ready weapon
 	player->PendingWeapon = player->ReadyWeapon;
 	P_BringUpWeapon (player);
-	*/
 }
 
 //------------------------------------------------------------------------
diff --git a/src/p_user.cpp b/src/p_user.cpp
index f94cf70885..eef4f5025f 100644
--- a/src/p_user.cpp
+++ b/src/p_user.cpp
@@ -1103,10 +1103,7 @@ void APlayerPawn::GiveDefaultInventory ()
 			if (item != NULL && item->IsKindOf (RUNTIME_CLASS (AWeapon)) &&
 				static_cast<AWeapon*>(item)->CheckAmmo(AWeapon::EitherFire, false))
 			{
-				// [Spleen] ReadyWeapon will be set when P_MovePsprites calls P_BringUpWeapon
-				player->PendingWeapon = static_cast<AWeapon *> (item);
-				player->ReadyWeapon = NULL;
-				//player->ReadyWeapon = player->PendingWeapon = static_cast<AWeapon *> (item);
+				player->ReadyWeapon = player->PendingWeapon = static_cast<AWeapon *> (item);
 			}
 		}
 		di = di->Next;