- reverted r2783 because it was causing problems.

SVN r2792 (trunk)

src/g_game.cpp

@@ -1345,10 +1345,7 @@ void G_PlayerReborn (int player)
 	if (gamestate != GS_TITLELEVEL)
 	{
 		actor->GiveDefaultInventory ();
-
+		p->ReadyWeapon = p->PendingWeapon;
-		// [Spleen] ReadyWeapon will be set when P_MovePsprites calls P_BringUpWeapon
-		p->ReadyWeapon = NULL;
-		//p->ReadyWeapon = p->PendingWeapon;
 	}
 
     //Added by MC: Init bot structure.

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);
-	*/
 }
 
 //------------------------------------------------------------------------

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->ReadyWeapon = player->PendingWeapon = static_cast<AWeapon *> (item);
-				player->PendingWeapon = static_cast<AWeapon *> (item);
-				player->ReadyWeapon = NULL;
-				//player->ReadyWeapon = player->PendingWeapon = static_cast<AWeapon *> (item);
 			}
 		}
 		di = di->Next;