pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

doomlegacy-devel: Update to SVN revision 1595



Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Mon Oct 18 12:28:11 2021 +0200
Changeset:	d10d5b0e42cb4e964ddab0af135857d0d0d41f81

Modified Files:
	doomlegacy-devel/Makefile
	doomlegacy-devel/TODO
	doomlegacy-devel/distinfo
Removed Files:
	doomlegacy-devel/files/p_blockmap.c
	doomlegacy-devel/files/p_blockmap.h
	doomlegacy-devel/patches/patch-src_Makefile
	doomlegacy-devel/patches/patch-src_dstrings.c
	doomlegacy-devel/patches/patch-src_p__local.h
	doomlegacy-devel/patches/patch-src_p__setup.c

Log Message:
doomlegacy-devel: Update to SVN revision 1595

Feature request #96 (create blockmap) was merged upstream.
Remove corresponding pkgsrc patches.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d10d5b0e42cb4e964ddab0af135857d0d0d41f81

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 doomlegacy-devel/Makefile                     |   4 +-
 doomlegacy-devel/TODO                         |  24 +++
 doomlegacy-devel/distinfo                     |   4 -
 doomlegacy-devel/files/p_blockmap.c           | 275 --------------------------
 doomlegacy-devel/files/p_blockmap.h           |  32 ---
 doomlegacy-devel/patches/patch-src_Makefile   |  17 --
 doomlegacy-devel/patches/patch-src_dstrings.c |  19 --
 doomlegacy-devel/patches/patch-src_p__local.h |  19 --
 doomlegacy-devel/patches/patch-src_p__setup.c |  69 -------
 9 files changed, 25 insertions(+), 438 deletions(-)

diffs:
diff --git a/doomlegacy-devel/Makefile b/doomlegacy-devel/Makefile
index ff30d9fe55..7a69ecfbf2 100644
--- a/doomlegacy-devel/Makefile
+++ b/doomlegacy-devel/Makefile
@@ -2,7 +2,7 @@
 
 VERS=		1.48.8
 #PKGNAME=	doomlegacy-${VERS}
-SVNVERS=	1594
+SVNVERS=	1595
 DISTNAME=	doomlegacy-devel-0r${SVNVERS}
 CATEGORIES=	games
 
@@ -99,8 +99,6 @@ pre-configure:
 	${CP} ${FILESDIR}/INSTALL.pkgsrc ${WRKDIR}
 	${CP} ${FILESDIR}/doomlegacy.sh ${WRKDIR}
 	${CP} ${FILESDIR}/doomlegacy.6.in ${WRKDIR}
-	${CP} ${FILESDIR}/p_blockmap.c ${WRKSRC}/src
-	${CP} ${FILESDIR}/p_blockmap.h ${WRKSRC}/src
 	cd ${WRKSRC} && ${CP} make_options_nix make_options
 
 # Move configure options and process manpage template
diff --git a/doomlegacy-devel/TODO b/doomlegacy-devel/TODO
index f3ef951fb5..54011ba09d 100644
--- a/doomlegacy-devel/TODO
+++ b/doomlegacy-devel/TODO
@@ -1,4 +1,19 @@
 
+Part�8:�Support�for�extended�nodes
+==================================
+[X]�Add�patch�to�support�DeeP�and�ZDoom�extended�nodes
+����This�code�is�based�on�woof�1.2.0
+����Fixes�Bug�#657
+[X]�Created�upstream�feature�request�#95
+����=>�Deferred�(not�considered�for�1.48�release)
+[X]�Add�optional�zlib�dependency�for�build�system
+[X]�Add�support�for�compressed�ZDoom�extended�nodes
+����Use�"zdbsp�-z"�to�create�test�map�with�compressed�ZDoom�extended�nodes
+����=>�Works�as�expected
+
+Merged in SVN revision 1585.
+
+
 Part 9: Support for internal blockmap creation
 ==============================================
 Make it possible to play maps with broken blockmaps (or no blockmaps at all).
@@ -22,6 +37,8 @@ Make it possible to play maps with broken blockmaps (or no blockmaps at all).
     (bug in original MBF code)
 [X] Updated upstream feature request #96
 
+Merged in SVN revision 1595.
+
 
 Part 18: Import final release
 =============================
@@ -44,4 +61,11 @@ Clang 10 reports warning for a comparison to be always true.
     =>�Tested�to�work�with�SVN�revision�1574
 
 
+Part 20: Label at end of compound statement
+===========================================
+Tested with GCC 7.4.0.
+
+[X] Created upstream bug report #679
+
+
 EOF
diff --git a/doomlegacy-devel/distinfo b/doomlegacy-devel/distinfo
index 47ae48b5f9..3a82a1633c 100644
--- a/doomlegacy-devel/distinfo
+++ b/doomlegacy-devel/distinfo
@@ -4,9 +4,5 @@ SHA1 (doomlegacy_1.48.8_common.zip) = 536f387824d50208e7494547afd21a92a6ef877d
 RMD160 (doomlegacy_1.48.8_common.zip) = 7fa66010f384411972f052ecf3676ce22d43f267
 SHA512 (doomlegacy_1.48.8_common.zip) = 4b93aed03bcfd9eb0dd22f0b9231e93e63ee2cc0eee6a3a9854def384c4c290dbdb586eb8d888392c53d8a5d549718eb7b4f55cecb1c4924c03b18125876b292
 Size (doomlegacy_1.48.8_common.zip) = 1011350 bytes
-SHA1 (patch-src_Makefile) = a5f42fcf91d516271942d82d574bc25291e987af
 SHA1 (patch-src_am__map.c) = 14b3c8b70c63778ad043827ab2f0b6f4fe07bcde
-SHA1 (patch-src_dstrings.c) = 9c3f8418a25684de72e9ad980f0390b58db12d58
 SHA1 (patch-src_hardware_hw__main.c) = 39fb78e49e8ea155f6bce07780ed2cab3d5353e6
-SHA1 (patch-src_p__local.h) = ad6c770b95e87fb06e34ec7643e98f59d41e71f4
-SHA1 (patch-src_p__setup.c) = f2ef19104efb673b1df7b1573a5ff7a6d95846db
diff --git a/doomlegacy-devel/files/p_blockmap.c b/doomlegacy-devel/files/p_blockmap.c
deleted file mode 100644
index 8b5aa96de3..0000000000
--- a/doomlegacy-devel/files/p_blockmap.c
+++ /dev/null
@@ -1,275 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1999 id Software, Chi Hoang, Lee Killough, Jim Flynn,
-//                   Rand Phares, Ty Halderman
-// Copyright(C) 2005-2014 Simon Howard
-// Copyright(C) 2017 Fabian Greffrath
-// Copyright(C) 2020 by DooM Legacy Team
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// DESCRIPTION:
-// [crispy] Create Blockmap
-// [MB] 2020-05-13: Description of blockmap lump format:
-//      https://doomwiki.org/wiki/Blockmap
-//
-
-#include <stdint.h>      // [MB] 2020-05-13: Added for C99 integer data types
-#include <stdlib.h>
-#include <string.h>      // [MB] 2020-05-12: Added for memset()
-
-//#include "i_system.h"  // [MB] 2020-05-12: I_Realloc() is now here
-#include "doomincl.h"    // [MB] 2020-05-12: Added for I_Error()
-#include "p_local.h"
-#include "r_state.h"
-#include "z_zone.h"
-
-
-// I_Realloc
-/*
- * [MB] 2020-05-12: Ported from Crispy Doom 5.8.0 (src/i_system.c)
- * - Reject zero new size (would be implementation defined behaviour)
- * - Use (unsigned long) for I_Error() (size is not a pointer)
- */
-static void *I_Realloc(void *ptr, size_t size)
-{
-    void *new_ptr = NULL;
-
-    if (0 == size)
-        I_Error("I_Realloc: Failed on zero new size");
-    else
-    {
-        new_ptr = realloc(ptr, size);
-        if (NULL == new_ptr)
-            I_Error("I_Realloc: Failed on reallocation of %lu bytes",
-                    (unsigned long) size);
-    }
-
-    return new_ptr;
-}
-
-
-// [crispy] taken from mbfsrc/P_SETUP.C:547-707, slightly adapted
-/*
- * [MB] 2020-05-12: Ported from Crispy Doom 5.8.0 (src/doom/p_blockmap.c)
- * - Change indentation to 4 SPs (matching DooM Legacy style)
- * - Replace blockmap with blockmapindex (int32_t* => uint32_t*)
- *   Global pointer to header of the blockmap lump
- * - Replace blockmaplump with blockmaphead (int32_t* => uint32_t*)
- *   Global pointer to beginning of the part containing the offsets
- * - Added typecasts for unsigned target types
- *
- * [MB] 2020-11-18: Added patch from Altazimuth for Eternity Engine
- * https://github.com/team-eternity/eternity/commit/d89fae15b55e92f3d88c32f401248ecf99624746
- * - Bugfix for handling of first vertex
- * - Demo version dependency removed
- */
-void P_CreateBlockMap(void)
-{
-    register int i;
-    fixed_t minx = INT_MAX, miny = INT_MAX;
-    fixed_t maxx = INT_MIN, maxy = INT_MIN;
-
-#if 1
-    // [MB] 2020-11-18: Added patch from Altazimuth for Eternity Engine
-    // This fixes MBF's code, which has a bug where maxx/maxy
-    // are wrong if the 0th node has the largest x or y
-    if (numvertexes)
-    {
-        minx = maxx = vertexes->x >> FRACBITS;
-        miny = maxy = vertexes->y >> FRACBITS;
-    }
-#endif
-
-    // First find limits of map
-    for (i=0 ; i<numvertexes ; i++)
-    {
-        if (vertexes[i].x >> FRACBITS < minx)
-            minx = vertexes[i].x >> FRACBITS;
-        else if (vertexes[i].x >> FRACBITS > maxx)
-            maxx = vertexes[i].x >> FRACBITS;
-        if (vertexes[i].y >> FRACBITS < miny)
-            miny = vertexes[i].y >> FRACBITS;
-        else if (vertexes[i].y >> FRACBITS > maxy)
-            maxy = vertexes[i].y >> FRACBITS;
-    }
-
-    // [crispy] doombsp/DRAWING.M:175-178
-    minx -= 8; miny -= 8;
-    maxx += 8; maxy += 8;
-
-    // Save blockmap parameters
-    bmaporgx = minx << FRACBITS;
-    bmaporgy = miny << FRACBITS;
-    bmapwidth  = ((maxx-minx) >> MAPBTOFRAC) + 1;
-    bmapheight = ((maxy-miny) >> MAPBTOFRAC) + 1;
-
-    // Compute blockmap, which is stored as a 2d array of variable-sized lists
-    //
-    // Pseudocode:
-    //
-    // For each linedef:
-    //
-    //   Map the starting and ending vertices to blocks.
-    //
-    //   Starting in the starting vertex's block, do:
-    //
-    //     Add linedef to current block's list, dynamically resizing it.
-    //
-    //     If current block is the same as the ending vertex's block,
-    //     exit loop.
-    //
-    //     Move to an adjacent block by moving towards the ending block in
-    //     either the x or y direction, to the block which contains the
-    //     linedef.
-    {
-        typedef struct { int n, nalloc, *list; } bmap_t;  // blocklist structure
-        unsigned tot = bmapwidth * bmapheight;            // size of blockmap
-        bmap_t *bmap = calloc(sizeof *bmap, tot);         // array of blocklists
-        int x, y, adx, ady, bend;
-
-        for (i=0; i < numlines; i++)
-        {
-            int dx, dy, diff, b;
-
-            // starting coordinates
-            x = (lines[i].v1->x >> FRACBITS) - minx;
-            y = (lines[i].v1->y >> FRACBITS) - miny;
-
-            // x-y deltas
-            adx = lines[i].dx >> FRACBITS, dx = adx < 0 ? -1 : 1;
-            ady = lines[i].dy >> FRACBITS, dy = ady < 0 ? -1 : 1;
-
-            // difference in preferring to move across y (>0) instead of x (<0)
-            diff = !adx ? 1 : !ady ? -1 :
-                ( ((x >> MAPBTOFRAC) << MAPBTOFRAC) +
-                    (dx > 0 ? MAPBLOCKUNITS-1 : 0) - x ) *
-                    (ady = abs(ady)) * dx -
-                ( ((y >> MAPBTOFRAC) << MAPBTOFRAC) +
-                    (dy > 0 ? MAPBLOCKUNITS-1 : 0) - y ) *
-                    (adx = abs(adx)) * dy;
-
-            // starting block, and pointer to its blocklist structure
-            b = (y >> MAPBTOFRAC)*bmapwidth + (x >> MAPBTOFRAC);
-
-            // ending block
-            bend = (((lines[i].v2->y >> FRACBITS) - miny) >> MAPBTOFRAC) *
-                bmapwidth +
-                    (((lines[i].v2->x >> FRACBITS) - minx) >> MAPBTOFRAC);
-
-            // delta for pointer when moving across y
-            dy *= bmapwidth;
-
-            // deltas for diff inside the loop
-            adx <<= MAPBTOFRAC;
-            ady <<= MAPBTOFRAC;
-
-            // Now we simply iterate block-by-block until we reach the end block
-            while ((unsigned) b < tot)    // failsafe -- should ALWAYS be true
-            {
-                // Increase size of allocated list if necessary
-                if (bmap[b].n >= bmap[b].nalloc)
-                    bmap[b].list = I_Realloc(bmap[b].list,
-                        ( bmap[b].nalloc = bmap[b].nalloc ?
-                            bmap[b].nalloc*2 : 8 ) *
-                            sizeof*bmap->list);
-
-                // Add linedef to end of list
-                bmap[b].list[bmap[b].n++] = i;
-
-                // If we have reached the last block, exit
-                if (b == bend)
-                    break;
-
-                // Move in either the x or y direction to the next block
-                if (diff < 0)
-                    diff += ady, b += dx;
-                else
-                    diff -= adx, b += dy;
-            }
-        }
-
-        // Compute the total size of the blockmap.
-        //
-        // Compression of empty blocks is performed by reserving two offset
-        // words at tot and tot+1.
-        //
-        // 4 words, unused if this routine is called, are reserved at the start.
-        {
-            int count = tot+6;  // we need at least 1 word per block,
-                                // plus reserved's
-
-            for (i = 0; i < tot; i++)
-                if (bmap[i].n)
-                    count += bmap[i].n + 2; // 1 header word + 1 trailer word +
-                                            // blocklist
-
-            // Allocate blockmap lump with computed count
-            blockmaphead = Z_Malloc(sizeof(*blockmaphead) * count, PU_LEVEL, 0);
-        }
-
-        // Now compress the blockmap.
-        {
-            int ndx = tot += 4;       // Advance index to start of linedef lists
-            bmap_t *bp = bmap;        // Start of uncompressed blockmap
-
-            blockmaphead[ndx++] = 0;  // Store an empty blockmap list at start
-            blockmaphead[ndx++] = (uint32_t)INT32_C(-1); // (For compression)
-
-            for (i = 4; i < tot; i++, bp++)
-                if (bp->n)                               // Non-empty blocklist
-                {
-                                                         // Store index & header
-                    blockmaphead[blockmaphead[i] = ndx++] = 0;
-                    do
-                                                         // Copy linedef list
-                        blockmaphead[ndx++] = (uint32_t)(unsigned int)
-                                              bp->list[--bp->n];
-                    while (bp->n);
-                                                         // Store trailer
-                    blockmaphead[ndx++] = (uint32_t)INT32_C(-1);
-                    free(bp->list);                      // Free linedef list
-                }
-                else       // Empty blocklist: point to reserved empty blocklist
-                    blockmaphead[i] = tot;
-
-        }
-
-        // [MB] 2020-05-13: Moved outside of last nested block to make it more
-        //                  obvious that the free() is always executed
-        free(bmap);  // Free uncompressed blockmap
-    }
-
-#if 1
-    // [MB] 2020-05-13: Populate blockmap lump header
-    /*
-     * Currently DooM Legacy 1.48 does not use this header. Maybe useful for
-     * debugging.
-     */
-    {
-        blockmaphead[0] = bmaporgx>>FRACBITS;  // x coordinate of grid origin
-        blockmaphead[1] = bmaporgy>>FRACBITS;  // y coordinate of grid origin
-        blockmaphead[2] = bmapwidth;           // Number of columns
-        blockmaphead[3] = bmapheight;          // Number of rows
-    }
-#endif
-
-    // [crispy] copied over from P_LoadBlockMap()
-    // [MB] 2020-05-13: Modified to match "clear out mobj chains" of DooM Legacy
-    {
-        int count = sizeof(*blocklinks) * bmapwidth * bmapheight;
-
-        blocklinks = Z_Malloc(count, PU_LEVEL, 0);
-        memset(blocklinks, 0, count);
-        //blockmapindex = blockmaphead+4;
-        blockmapindex = & blockmaphead[4];
-    }
-}
diff --git a/doomlegacy-devel/files/p_blockmap.h b/doomlegacy-devel/files/p_blockmap.h
deleted file mode 100644
index 2c71bfc5ff..0000000000
--- a/doomlegacy-devel/files/p_blockmap.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Emacs style mode select   -*- C++ -*- 
-//-----------------------------------------------------------------------------
-//
-//  Copyright(C) 2020 by DooM Legacy Team
-//
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 
-//  02111-1307, USA.
-//
-//  DESCRIPTION:
-//  Header file created for blockmap creation code from Crispy Doom.
-//
-//-----------------------------------------------------------------------------
-
-
-#ifndef __P_BLOCKMAP__
-#define __P_BLOCKMAP__
-
-void P_CreateBlockMap (void);
-
-#endif
diff --git a/doomlegacy-devel/patches/patch-src_Makefile b/doomlegacy-devel/patches/patch-src_Makefile
deleted file mode 100644
index 004f3a6d95..0000000000
--- a/doomlegacy-devel/patches/patch-src_Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-Add object file for internal blockmap creation.
-
-Created upstream feature requests:
-https://sourceforge.net/p/doomlegacy/feature-requests/96/
-
---- src/Makefile.orig	2021-09-27 10:05:53.000000000 +0000
-+++ src/Makefile
-@@ -1245,6 +1245,7 @@ p_sight.o p_mobj.o p_enemy.o p_user.o p_
- p_lights.o p_ceilng.o p_doors.o p_plats.o p_floor.o p_spec.o \
- p_switch.o p_genlin.o p_telept.o p_tick.o p_fab.o p_info.o p_setup.o \
- p_extnodes.o \
-+p_blockmap.o \
- p_map.o p_maputl.o \
- p_heretic.o p_hsight.o \
- p_chex.o \
diff --git a/doomlegacy-devel/patches/patch-src_dstrings.c b/doomlegacy-devel/patches/patch-src_dstrings.c
deleted file mode 100644
index bbb13ba849..0000000000
--- a/doomlegacy-devel/patches/patch-src_dstrings.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-Print note that this is a patched version to terminal.
-https://sourceforge.net/p/doomlegacy/feature-requests/96/
-
---- src/dstrings.c.orig	2021-09-27 10:05:58.000000000 +0000
-+++ src/dstrings.c
-@@ -542,6 +542,11 @@ char *text[NUMTEXT] = {
-     "get a copy of the original game, call 1-800-IDGAMES or see the readme file.\n"
-     "        You will not receive technical support for modified games.\n"
-     "                      press enter to continue\n"
-+    "===========================================================================\n"
-+    "===========================================================================\n"
-+    "Note for pkgsrc: This version uses pkgsrc patches for additional features:\n"
-+    "- Support for \"-blockmap\" command line option (create blockmap internally,\n"
-+    "  Feature request #96)\n"
-     "===========================================================================\n",
- 
-   // SHAREWARE
diff --git a/doomlegacy-devel/patches/patch-src_p__local.h b/doomlegacy-devel/patches/patch-src_p__local.h
deleted file mode 100644
index 8d9cbbe171..0000000000
--- a/doomlegacy-devel/patches/patch-src_p__local.h
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-Add support to internally create blockmap.
-https://sourceforge.net/p/doomlegacy/feature-requests/96/
-
---- src/p_local.h.orig	2020-05-11 09:40:33.000000000 +0000
-+++ src/p_local.h
-@@ -379,8 +379,9 @@ void P_ApplyTorque(mobj_t *mo);
- extern byte*            rejectmatrix;   // for fast sight rejection
- // Read wad blockmap using int16_t wadblockmaplump[].
- // Expand from 16bit wad to internal 32bit blockmap.
--extern uint32_t*        blockmaphead;   // offsets in blockmap are from here
--extern uint32_t*        blockmapindex;  // Big blockmap, SSNTails
-+// [MB] 2020-05-13: Fix comments (blockmapindex points to offset part of lump)
-+extern uint32_t*        blockmaphead;   // Big blockmap, SSNTails
-+extern uint32_t*        blockmapindex;  // offsets in blockmap are from here
- extern unsigned int     bmapwidth;
- extern unsigned int     bmapheight;     // in mapblocks
- extern fixed_t          bmaporgx;
diff --git a/doomlegacy-devel/patches/patch-src_p__setup.c b/doomlegacy-devel/patches/patch-src_p__setup.c
deleted file mode 100644
index e84a7d3c25..0000000000
--- a/doomlegacy-devel/patches/patch-src_p__setup.c
+++ /dev/null
@@ -1,69 +0,0 @@
-$NetBSD$
-
-Add support to internally create blockmap.
-https://sourceforge.net/p/doomlegacy/feature-requests/96/
-
---- src/p_setup.c.orig	2021-09-27 10:05:53.000000000 +0000
-+++ src/p_setup.c
-@@ -150,6 +150,8 @@
- //-----------------------------------------------------------------------------
- 
- #include "doomincl.h"
-+#include "m_argv.h"      // [MB] 2020-05-13: To check for "-blockmap" option
-+#include "p_blockmap.h"  // [MB] 2020-05-13: For internal blockmap creation
- #include "p_local.h"
- #include "p_tick.h"
-   // think
-@@ -256,14 +258,15 @@ typedef struct mapdata_s {
- // Created from axis aligned bounding box of the map, a rectangular array of
- // blocks of size ...
- // Used to speed up collision detection by spatial subdivision in 2D.
-+// [MB] 2020-05-13: Fix comments (blockmapindex points to offset part of lump)
- //
- // Blockmap size.
- unsigned int    bmapwidth;
- unsigned int    bmapheight;     // size in mapblocks
- 
--uint32_t *      blockmapindex;       // for large maps, wad is 16bit
--// offsets in blockmap are from here
--uint32_t *      blockmaphead; // Big blockmap, SSNTails
-+uint32_t *      blockmaphead;   // Big blockmap, SSNTails
-+uint32_t *      blockmapindex;  // For large maps, wad is 16bit
-+                                // (offsets in blockmap are from here)
- 
- // origin of block map
- // The bottom left corner of the most SW block.
-@@ -2221,14 +2224,25 @@ boolean P_SetupLevel (int      to_episod
-     }
- 
-     // note: most of this ordering is important
--    P_LoadBlockMap (level_lumpnum+ML_BLOCKMAP);
--    P_LoadVertexes (level_lumpnum+ML_VERTEXES);
--    P_LoadSectors  (level_lumpnum+ML_SECTORS);
--    P_LoadSideDefs (level_lumpnum+ML_SIDEDEFS);
--
--    P_LoadLineDefs (level_lumpnum+ML_LINEDEFS);
--    P_LoadSideDefs2(level_lumpnum+ML_SIDEDEFS);
--    P_LoadLineDefs2();
-+    {
-+        // [MB] 2020-05-13: Added option to internally create blockmap
-+        boolean create_blockmap = M_CheckParm("-blockmap");
-+
-+        if (!create_blockmap)
-+            P_LoadBlockMap (level_lumpnum+ML_BLOCKMAP);
-+        P_LoadVertexes (level_lumpnum+ML_VERTEXES);
-+        P_LoadSectors  (level_lumpnum+ML_SECTORS);
-+        P_LoadSideDefs (level_lumpnum+ML_SIDEDEFS);
-+        P_LoadLineDefs (level_lumpnum+ML_LINEDEFS);
-+        P_LoadSideDefs2(level_lumpnum+ML_SIDEDEFS);
-+        P_LoadLineDefs2();
-+        // [MB] 2020-05-13: Internally create blockmap on request
-+        if (create_blockmap)
-+        {
-+            GenPrintf(EMSG_info, "Ignore BLOCKMAP lump, create blockmap\n" );
-+            P_CreateBlockMap ();
-+        }
-+    }
- 
- #ifdef DEEPSEA_EXTENDED_NODES
-     // [MB] 2020-04-21: Hook in code imported from woof 1.2.0 (p_extnodes.c)


Home | Main Index | Thread Index | Old Index