From 78164aab400771de99104f0618dec0722c6cdbba Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Wed, 30 Jan 2008 18:45:15 +0000
Subject: [PATCH] - Added support for AttackZOffset to P_RailAttack. - Fixed:
 ParseDrawTextureTags read DTA_RenderStyle as ERenderStyle, not FRenderStyle.

SVN r726 (trunk)
---
 docs/rh-log.txt                 |  4 ++++
 src/p_map.cpp                   | 12 +++++++++++-
 src/v_draw.cpp                  |  2 +-
 wadsrc/languages/english-us.txt |  2 +-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 2161c967a..f65b62252 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -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
 - Added pixel-doubled and -quadrupled screen modes to D3DFB so that users with
   recent NVidia drivers can still use resolutions below 640x480, since NVidia
diff --git a/src/p_map.cpp b/src/p_map.cpp
index f99659e1e..de15b24fa 100644
--- a/src/p_map.cpp
+++ b/src/p_map.cpp
@@ -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];
diff --git a/src/v_draw.cpp b/src/v_draw.cpp
index ea2d429ce..eabaaafd3 100644
--- a/src/v_draw.cpp
+++ b/src/v_draw.cpp
@@ -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);
diff --git a/wadsrc/languages/english-us.txt b/wadsrc/languages/english-us.txt
index e2a5ac976..93f91a8b3 100644
--- a/wadsrc/languages/english-us.txt
+++ b/wadsrc/languages/english-us.txt
@@ -29,7 +29,7 @@ QUITMSG14 = "you're lucky i don't smack\nyou for thinking about leaving.";
 
 // Quit Strife messages
 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!!";
 QUITMSG18 = "nobody walks out on blackbird.";
 QUITMSG19 = "i thought you were different...";