OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Revert "- re-added P_SetPSrite."

Browse source 
This reverts commit e6d89b9f71.
This commit is contained in:
Leonard2 2016-05-29 23:21:49 +02:00
commit 8668719bbc
15 changed files with 48 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/m_cheat.cpp
View file

@ -345,7 +345,7 @@ void cht_DoCheat (player_t *player, int cheat)
player->mo->DamageType = NAME_None;
if (player->ReadyWeapon != nullptr)
{
P_SetPsprite(player, PSP_WEAPON, player->ReadyWeapon->GetUpState());
player->GetPSprite(PSP_WEAPON)->SetState(player->ReadyWeapon->GetUpState());
}
if (player->morphTics > 0)
@ -934,8 +934,8 @@ void cht_Take (player_t *player, const char *name, int amount)
player->ReadyWeapon = nullptr;
player->PendingWeapon = WP_NOCHANGE;
P_SetPsprite(player, PSP_WEAPON, nullptr);
P_SetPsprite(player, PSP_FLASH, nullptr);
player->GetPSprite(PSP_WEAPON)->SetState(nullptr);
player->GetPSprite(PSP_FLASH)->SetState(nullptr);
}
}