- Added support for AttackZOffset to P_RailAttack.

- 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
parent 17e9a2c8fd
commit 78164aab40
4 changed files with 17 additions and 3 deletions

View file

@ -1,3 +1,7 @@
January 30, 2008 (Changes by Graf Zahl)
- Added support for AttackZOffset to P_RailAttack.
- Fixed: ParseDrawTextureTags read DTA_RenderStyle as ERenderStyle, not FRenderStyle.
January 29, 2008 January 29, 2008
- Added pixel-doubled and -quadrupled screen modes to D3DFB so that users with - Added pixel-doubled and -quadrupled screen modes to D3DFB so that users with
recent NVidia drivers can still use resolutions below 640x480, since NVidia recent NVidia drivers can still use resolutions below 640x480, since NVidia

View file

@ -3137,7 +3137,17 @@ void P_RailAttack (AActor *source, int damage, int offset, int color1, int color
x1 = source->x; x1 = source->x;
y1 = source->y; 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; angle = (source->angle - ANG90) >> ANGLETOFINESHIFT;
x1 += offset*finecosine[angle]; x1 += offset*finecosine[angle];

View file

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

View file

@ -29,7 +29,7 @@ QUITMSG14 = "you're lucky i don't smack\nyou for thinking about leaving.";
// Quit Strife messages // Quit Strife messages
QUITMSG15 = "where are you going?!\nwhat about the rebellion?"; QUITMSG15 = "where are you going?!\nwhat about the rebellion?";
QUITMSG16 = "carnage interrupted...\nwhat a tease!"; QUITMSG16 = "carnage interruptus...\nwhat a tease!";
QUITMSG17 = "but you're the hope\n-- my only chance!!"; QUITMSG17 = "but you're the hope\n-- my only chance!!";
QUITMSG18 = "nobody walks out on blackbird."; QUITMSG18 = "nobody walks out on blackbird.";
QUITMSG19 = "i thought you were different..."; QUITMSG19 = "i thought you were different...";