OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

The ReadyWeapon is now assumed to not be null

Browse source
This commit is contained in:
Leonard2 2016-05-30 15:09:03 +02:00
commit f14a840777
3 changed files with 39 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/r_things.cpp
View file

@ -1319,8 +1319,8 @@ void R_DrawPSprite(DPSprite *pspr, AActor *owner, float bobx, float boby, double
if (tex->UseType == FTexture::TEX_Null)
return;
isweapon = ((pspr->GetID() == PSP_WEAPON || pspr->GetID() == PSP_FLASH) ||
(pspr->GetID() < PSP_TARGETCENTER && pspr->GetCaller()->IsKindOf(RUNTIME_CLASS(AWeapon))));
// The targeters aren't weapons.
isweapon = (pspr->GetID() < PSP_TARGETCENTER && pspr->GetCaller()->IsKindOf(RUNTIME_CLASS(AWeapon)));
if (pspr->firstTic)
{ // Can't interpolate the first tic.