OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'PSprites'

Browse source
This commit is contained in:
Christoph Oelckers 2016-06-16 16:16:16 +02:00
commit 7ccdbf9b62
28 changed files with 1018 additions and 518 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/thingdef/thingdef_codeptr.cpp
View file

@ -5839,15 +5839,18 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetTics)
PARAM_ACTION_PROLOGUE;
PARAM_INT(tics_to_set);
if (stateowner != self && self->player != NULL && stateowner->IsKindOf(RUNTIME_CLASS(AWeapon)))
{ // Is this a weapon? Need to check psp states for a match, then. Blah.
for (int i = 0; i < NUMPSPRITES; ++i)
if (self->player != nullptr)
{ // Need to check psp states for a match, then. Blah.
DPSprite *pspr = self->player->psprites;
while (pspr)
{
if (self->player->psprites[i].state == callingstate)
if (pspr->GetState() == callingstate)
{
self->player->psprites[i].tics = tics_to_set;
pspr->Tics = tics_to_set;
return 0;
}
pspr = pspr->GetNext();
}
}
// Just set tics for self.