OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added support for AttackZOffset to P_RailAttack.

Browse source 
- Fixed: ParseDrawTextureTags read DTA_RenderStyle as ERenderStyle, not FRenderStyle.


SVN r726 (trunk)
This commit is contained in:
Christoph Oelckers 2008-01-30 18:45:15 +00:00
commit 78164aab40
4 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/p_map.cpp
View file

@ -3137,7 +3137,17 @@ void P_RailAttack (AActor *source, int damage, int offset, int color1, int color
x1 = source->x;
y1 = source->y;
shootz = source->z - source->floorclip + (source->height >> 1) + 8*FRACUNIT;
shootz = source->z - source->floorclip + (source->height >> 1);
if (source->player != NULL)
{
shootz += FixedMul (source->player->mo->AttackZOffset, source->player->crouchfactor);
}
else
{
shootz += 8*FRACUNIT;
}
angle = (source->angle - ANG90) >> ANGLETOFINESHIFT;
x1 += offset*finecosine[angle];

2
src/v_draw.cpp
View file

@ -535,7 +535,7 @@ bool DCanvas::ParseDrawTextureTags (FTexture *img, int x, int y, DWORD tag, va_l
break;
case DTA_RenderStyle:
parms->style = ERenderStyle(va_arg (tags, int));
parms->style = va_arg (tags, FRenderStyle);
break;
}
tag = va_arg (tags, DWORD);