OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Reimplemented P_SetPsprite.

Browse source
This commit is contained in:
MajorCooke 2016-06-16 07:24:00 -05:00
commit c9f4620702
14 changed files with 50 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/g_shared/a_artifacts.cpp
View file

@ -1131,7 +1131,7 @@ void APowerWeaponLevel2::InitEffect ()
if (weapon->GetReadyState() != sister->GetReadyState())
{
Owner->player->GetPSprite(PSP_WEAPON)->SetState(sister->GetReadyState());
P_SetPsprite(Owner->player, PSP_WEAPON, sister->GetReadyState());
}
}
@ -1310,9 +1310,9 @@ void APowerTargeter::InitEffect ()
if (state != nullptr)
{
player->GetPSprite(PSP_TARGETCENTER)->SetState(state + 0);
player->GetPSprite(PSP_TARGETLEFT)->SetState(state + 1);
player->GetPSprite(PSP_TARGETRIGHT)->SetState(state + 2);
P_SetPsprite(player, PSP_TARGETCENTER, state + 0);
P_SetPsprite(player, PSP_TARGETLEFT, state + 1);
P_SetPsprite(player, PSP_TARGETRIGHT, state + 2);
}
player->GetPSprite(PSP_TARGETCENTER)->x = (160-3);
@ -1357,13 +1357,13 @@ void APowerTargeter::DoEffect ()
{
if (EffectTics & 32)
{
player->GetPSprite(PSP_TARGETRIGHT)->SetState(nullptr);
player->GetPSprite(PSP_TARGETLEFT)->SetState(state + 1);
P_SetPsprite(player, PSP_TARGETRIGHT, nullptr);
P_SetPsprite(player, PSP_TARGETLEFT, state + 1);
}
else if (EffectTics & 16)
{
player->GetPSprite(PSP_TARGETRIGHT)->SetState(state + 2);
player->GetPSprite(PSP_TARGETLEFT)->SetState(nullptr);
P_SetPsprite(player, PSP_TARGETRIGHT, state + 2);
P_SetPsprite(player, PSP_TARGETLEFT, nullptr);
}
}
}