- let player_t::Resurrect use P_BringUpWeapon to raise the weapon again instead of doing it directly.

This seems a bit safer.

src/g_inventory/a_weapons.cpp

@@ -227,26 +227,6 @@ bool AWeapon::CheckAmmo(int fireMode, bool autoSwitch, bool requireAmmo, int amm
 	return false;
 }
 
-//===========================================================================
-//
-// AWeapon :: GetUpState
-//
-//===========================================================================
-
-FState *AWeapon::GetUpState ()
-{
-	IFVIRTUAL(AWeapon, GetUpState)
-	{
-		VMValue params[1] = { (DObject*)this };
-		VMReturn ret;
-		FState *retval;
-		ret.PointerAt((void**)&retval);
-		VMCall(func, params, 1, &ret, 1);
-		return retval;
-	}
-	return nullptr;
-}
-
 //===========================================================================
 //
 // AWeapon :: GetDownState

src/g_inventory/a_weapons.h

@@ -129,7 +129,6 @@ public:
 	void Serialize(FSerializer &arc) override;
 
 	// scripted virtuals.
-	FState *GetUpState ();
 	FState *GetDownState ();
 
 	enum

src/p_user.cpp

@@ -690,7 +690,8 @@ bool player_t::Resurrect()
 	}
 	if (ReadyWeapon != nullptr)
 	{
-		P_SetPsprite(this, PSP_WEAPON, ReadyWeapon->GetUpState());
+		PendingWeapon = ReadyWeapon;
+		P_BringUpWeapon(this);
 	}
 
 	if (morphTics)