OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: Weapon positions were only adjusted in 1280x1024 if the status

Browse source 
bar was hidden.
- Fixed: If you died in co-op and somebody else ended the map before you
  respawned, you would start the next map with only default inventory, no
  matter what dmflags was set to.


SVN r691 (trunk)
This commit is contained in:
Randy Heit 2008-01-11 01:43:37 +00:00
commit a9dc8ddce3
7 changed files with 45 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/r_things.cpp
View file

@ -1545,23 +1545,23 @@ void R_DrawPSprite (pspdef_t* psp, int pspnum, AActor *owner, fixed_t sx, fixed_
{
weapon = camera->player->ReadyWeapon;
}
if (pspnum <= ps_flash)
if (pspnum <= ps_flash && weapon != NULL && weapon->YAdjust != 0)
{
if (weapon != NULL && weapon->YAdjust != 0)
if (RenderTarget != screen || realviewheight == RenderTarget->GetHeight())
{
if (RenderTarget != screen || realviewheight == RenderTarget->GetHeight())
{
vis->texturemid -= weapon->YAdjust;
}
else
{
vis->texturemid -= FixedMul (StatusBar->GetDisplacement (),
weapon->YAdjust);
}
vis->texturemid -= weapon->YAdjust;
}
else
{
vis->texturemid -= FixedMul (StatusBar->GetDisplacement (),
weapon->YAdjust);
}
vis->texturemid -= BaseRatioSizes[WidescreenRatio][2];
}
}
if (pspnum <= ps_flash)
{ // Move the weapon down for 1280x1024.
vis->texturemid -= BaseRatioSizes[WidescreenRatio][2];
}
vis->x1 = x1 < 0 ? 0 : x1;
vis->x2 = x2 >= viewwidth ? viewwidth-1 : x2;
vis->xscale = DivScale16(pspritexscale, tex->xScale);