[prboom+] 02/03: Imported Upstream version 2.5.1.4~svn4429+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 5923d7584f6ed0663565946b4fae50d75f38a6ff
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Thu Jul 9 09:16:00 2015 +0200

    Imported Upstream version 2.5.1.4~svn4429+dfsg1
---
 src/p_setup.c | 2 ++
 src/r_defs.h  | 3 ++-
 src/r_segs.c  | 8 +-------
 src/w_wad.c   | 6 ------
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/p_setup.c b/src/p_setup.c
index 83dae41..8d859ad 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -2289,6 +2289,8 @@ static void R_CalcSegsLength(void)
     fixed_t dx = li->v2->px - li->v1->px;
     fixed_t dy = li->v2->py - li->v1->py;
     li->length = (fixed_t)sqrt((double)dx*dx + (double)dy*dy);
+    // [crispy] re-calculate angle used for rendering
+    li->pangle = R_PointToAngle2(li->v1->px, li->v1->py, li->v2->px, li->v2->py);
   }
 }
 
diff --git a/src/r_defs.h b/src/r_defs.h
index 064b847..ccf5b0d 100644
--- a/src/r_defs.h
+++ b/src/r_defs.h
@@ -285,7 +285,8 @@ typedef struct
   vertex_t *v1, *v2;
   fixed_t offset;
   angle_t angle;
-  fixed_t length;
+  angle_t pangle; // re-calculated angle used for rendering
+  fixed_t length; // fix long wall wobble
   side_t* sidedef;
   line_t* linedef;
 
diff --git a/src/r_segs.c b/src/r_segs.c
index 5718192..8722fcc 100644
--- a/src/r_segs.c
+++ b/src/r_segs.c
@@ -639,7 +639,6 @@ void R_StoreWallRange(const int start, const int stop)
 {
   const int shift_bits = 1;
   int_64_t dx, dy, dx1, dy1, len;
-  angle_t offsetangle;
 
   if (ds_p == drawsegs+maxdrawsegs)   // killough 1/98 -- fix 2s line HOM
     {
@@ -677,12 +676,7 @@ void R_StoreWallRange(const int start, const int stop)
   linedef->flags |= ML_MAPPED;
 
   // calculate rw_distance for scale calculation
-  rw_normalangle = curline->angle + ANG90;
-
-  offsetangle = rw_normalangle-rw_angle1;
-
-  if (D_abs(offsetangle) > ANG90)
-    offsetangle = ANG90;
+  rw_normalangle = curline->pangle + ANG90; // [crispy] use re-calculated angle
 
   // [Linguica] Fix long wall error
   // shift right to avoid possibility of int64 overflow in rw_distance calculation
diff --git a/src/w_wad.c b/src/w_wad.c
index ccc869e..4e67582 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -242,12 +242,6 @@ static void W_AddFile(wadfile_info_t *wadfile)
         }
         strncpy (lump_p->name, fileinfo->name, 8);
 	lump_p->source = wadfile->src;                    // Ty 08/29/98
-    // IWAD file used as recource PWAD must not override TEXTURE1 or PNAMES
-    if (wadfile->src != source_iwad && !strncmp(header.identification,"IWAD",4) &&
-      (!strnicmp(fileinfo->name,"TEXTURE1",8) || !strnicmp(fileinfo->name,"PNAMES",6)))
-    {
-      strncpy (lump_p->name, "-IGNORE-", 8);
-    }
       }
 
     free(fileinfo2free);      // killough

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