[prboom+] 03/06: Imported Upstream version 2.5.1.4~svn4444+dfsg1

[Fabian Greffrath]

This is an automated email from the git hooks/post-receive script.

fabian pushed a commit to branch master
in repository prboom+.

commit 41dff94ad02958aa1321d94f906e2a15747ed353
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Tue Sep 29 06:21:53 2015 +0200

    Imported Upstream version 2.5.1.4~svn4444+dfsg1
---
 ICONS/Makefile.am         |  4 ++--
 ICONS/prboom-plus.desktop | 10 ++++++++++
 src/hu_stuff.c            | 10 +++++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/ICONS/Makefile.am b/ICONS/Makefile.am
index 38e29f1..1b0c416 100644
--- a/ICONS/Makefile.am
+++ b/ICONS/Makefile.am
@@ -1,4 +1,4 @@
 #
 
-EXTRA_DIST = barrel.ico fouch.ico god.ico heada1.ico icons.rc resource.h skull.ico
-
+EXTRA_DIST = icons.rc resource.h prboom-plus.ico prboom-plus.exe.manifest
+EXTRA_DIST += prboom-plus.svg prboom-plus.desktop
diff --git a/ICONS/prboom-plus.desktop b/ICONS/prboom-plus.desktop
new file mode 100644
index 0000000..48f4169
--- /dev/null
+++ b/ICONS/prboom-plus.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=PrBoom+
+Comment=enhanced clone of the classic first-person shooter Doom
+Icon=prboom-plus
+TryExec=prboom-plus
+Exec=prboom-plus %F
+Categories=Game;ActionGame;
+MimeType=application/x-doom-wad;
+Keywords=first;person;shooter;doom;
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index 175a46e..af21a45 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -2247,10 +2247,18 @@ void HU_draw_crosshair(void)
   if (hudadd_crosshair_target || hudadd_crosshair_lock_target)
   {
     fixed_t slope;
+    angle_t an = plr->mo->angle;
     
     // intercepts overflow guard
     overflows_enabled = false;
-    slope = P_AimLineAttack(plr->mo, plr->mo->angle, 16*64*FRACUNIT, 0);
+    slope = P_AimLineAttack(plr->mo, an, 16*64*FRACUNIT, 0);
+    if (plr->readyweapon == wp_missile || plr->readyweapon == wp_plasma || plr->readyweapon == wp_bfg)
+    {
+      if (!linetarget)
+        slope = P_AimLineAttack(plr->mo, an += 1<<26, 16*64*FRACUNIT, 0);
+      if (!linetarget)
+        slope = P_AimLineAttack(plr->mo, an -= 2<<26, 16*64*FRACUNIT, 0);
+    }
     overflows_enabled = true;
 
     if (linetarget && !(linetarget->flags & MF_SHADOW))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/prboom+.git