diff --git a/src/g_inventory/a_weapons.cpp b/src/g_inventory/a_weapons.cpp index 0cd0583be..251a58bcb 100644 --- a/src/g_inventory/a_weapons.cpp +++ b/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 diff --git a/src/g_inventory/a_weapons.h b/src/g_inventory/a_weapons.h index ea2460b08..581629af6 100644 --- a/src/g_inventory/a_weapons.h +++ b/src/g_inventory/a_weapons.h @@ -129,7 +129,6 @@ public: void Serialize(FSerializer &arc) override; // scripted virtuals. - FState *GetUpState (); FState *GetDownState (); enum diff --git a/src/p_user.cpp b/src/p_user.cpp index 3b3802cc2..245a9fd21 100644 --- a/src/p_user.cpp +++ b/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)