doomlegacy-devel: Update to SVN revision 1567
- Support for second mouse - Fixes for blockmap import from WAD - Fixes for GCC 10
This commit is contained in:
Michael Baeuerle
parent
9cbec00dec
commit
9dbe6b8fe1
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
VERS= 1.48.6
|
||||
#PKGNAME= doomlegacy-${VERS}
|
||||
SVNVERS= 1563
|
||||
SVNVERS= 1567
|
||||
DISTNAME= doomlegacy-devel-0r${SVNVERS}
|
||||
CATEGORIES= games
|
||||
|
||||
|
|
@ -61,6 +61,7 @@ DOOMWADDIR= share/doom
|
|||
INSTALLATION_DIRS= bin ${PKGMANDIR}/man6 share/doc/doomlegacy ${DOOMWADDIR}
|
||||
|
||||
# Configure to honor environment and disable ZIP support on GNU/Linux
|
||||
# Use native CPU architecture
|
||||
SUBST_CLASSES+= makeopt
|
||||
SUBST_STAGE.makeopt= do-configure
|
||||
SUBST_MESSAGE.makeopt= Preparing make_options file ...
|
||||
|
|
@ -68,6 +69,8 @@ SUBST_FILES.makeopt= make_options
|
|||
SUBST_SED.makeopt= -e 's,\#[ ]*COMP_ENVIRONMENT,COMP_ENVIRONMENT,'
|
||||
SUBST_SED.makeopt+= -e 's,HAVE_LIBZIP,\# HAVE_LIBZIP,'
|
||||
SUBST_SED.makeopt+= -e 's,HAVE_DLOPEN,\# HAVE_DLOPEN,'
|
||||
SUBST_SED.makeopt+= -e 's,\# ARCH=-march=native,ARCH=-march=native,'
|
||||
SUBST_SED.makeopt+= -e 's,\ARCH=-march=i686,\# ARCH=-march=native,'
|
||||
# Enable debug build
|
||||
#SUBST_SED.makeopt+= -e 's,\# DEBUG=1,DEBUG=1,'
|
||||
|
||||
|
|
|
|||
|
|
@ -68,8 +68,13 @@ Part 17: Undefined behaviour
|
|||
============================
|
||||
GCC 10 produce several warnings while compiling the code.
|
||||
[X] Created upstream bug report #671
|
||||
Fixed in SVN revision 1561
|
||||
Fixed in SVN revisions 1561 and 1564
|
||||
=> Works as expected
|
||||
|
||||
|
||||
Part 18: Import final release
|
||||
=============================
|
||||
[ ] Import version 1.48.8 to pkgsrc
|
||||
|
||||
|
||||
EOF
|
||||
|
|
|
|||
|
|
@ -8,6 +8,6 @@ SHA1 (patch-src_Makefile) = 34c323bdd96787cb6afe0be5dc99b129ab8f1552
|
|||
SHA1 (patch-src_am__map.c) = 14b3c8b70c63778ad043827ab2f0b6f4fe07bcde
|
||||
SHA1 (patch-src_doomdata.h) = 8c3186dafbf11a8a75262a06755dd9807cb58612
|
||||
SHA1 (patch-src_dstrings.c) = 16e50ac649f76d415b820a0e5093d15af3180e6d
|
||||
SHA1 (patch-src_p__local.h) = e429f2ce5d60dd538bc5e796847b53ae72604b33
|
||||
SHA1 (patch-src_p__setup.c) = dcdd64c1ae97dc7f9cdccc834b6f34d301e124f5
|
||||
SHA1 (patch-src_p__local.h) = ad6c770b95e87fb06e34ec7643e98f59d41e71f4
|
||||
SHA1 (patch-src_p__setup.c) = f478975acbc64627d4b2727fa77d1b1252ffc719
|
||||
SHA1 (patch-src_r__defs.h) = 91e6543674e3474c9afdb0ba19d6869b658d0543
|
||||
|
|
|
|||
|
|
@ -14,6 +14,6 @@ https://sourceforge.net/p/doomlegacy/feature-requests/96/
|
|||
+// [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 int bmapwidth;
|
||||
extern int bmapheight; // in mapblocks
|
||||
extern unsigned int bmapwidth;
|
||||
extern unsigned int bmapheight; // in mapblocks
|
||||
extern fixed_t bmaporgx;
|
||||
|
|
|
|||
|
|
@ -20,15 +20,15 @@ https://sourceforge.net/p/doomlegacy/feature-requests/96/
|
|||
#include "p_local.h"
|
||||
#include "p_tick.h"
|
||||
// think
|
||||
@@ -251,14 +254,15 @@ typedef struct mapdata_s {
|
||||
@@ -253,15 +256,16 @@ 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.
|
||||
int bmapwidth;
|
||||
int bmapheight; // size in mapblocks
|
||||
unsigned int bmapwidth;
|
||||
unsigned int bmapheight; // size in mapblocks
|
||||
|
||||
-uint32_t * blockmapindex; // for large maps, wad is 16bit
|
||||
-// offsets in blockmap are from here
|
||||
|
|
@ -38,8 +38,9 @@ https://sourceforge.net/p/doomlegacy/feature-requests/96/
|
|||
+ // (offsets in blockmap are from here)
|
||||
|
||||
// origin of block map
|
||||
// The bottom left corner of the most SW block.
|
||||
fixed_t bmaporgx;
|
||||
@@ -282,6 +286,7 @@ mapthing_t * playerstarts[MAXPLAYERS]
|
||||
@@ -285,6 +289,7 @@ mapthing_t * playerstarts[MAXPLAYERS]
|
||||
|
||||
#if 0
|
||||
// [WDJ] Checks from PrBoom.
|
||||
|
|
@ -47,7 +48,7 @@ https://sourceforge.net/p/doomlegacy/feature-requests/96/
|
|||
|
||||
// figgi 08/21/00 -- constants and globals for glBsp support
|
||||
#define gNd2 0x32644E67
|
||||
@@ -793,7 +798,22 @@ void P_LoadNodes (int lump)
|
||||
@@ -796,7 +801,22 @@ void P_LoadNodes (int lump)
|
||||
no->dy = LE_SWAP16(mn->dy)<<FRACBITS;
|
||||
for (j=0 ; j<2 ; j++)
|
||||
{
|
||||
|
|
@ -71,7 +72,7 @@ https://sourceforge.net/p/doomlegacy/feature-requests/96/
|
|||
for (k=0 ; k<4 ; k++)
|
||||
no->bbox[j][k] = LE_SWAP16(mn->bbox[j][k])<<FRACBITS;
|
||||
}
|
||||
@@ -1851,6 +1871,7 @@ boolean P_SetupLevel (int to_episod
|
||||
@@ -1968,6 +1988,7 @@ boolean P_SetupLevel (int to_episod
|
||||
const char *errstr;
|
||||
char *sl_mapname = NULL;
|
||||
int i;
|
||||
|
|
@ -79,7 +80,7 @@ https://sourceforge.net/p/doomlegacy/feature-requests/96/
|
|||
|
||||
GenPrintf( (verbose? (EMSG_ver|EMSG_now) : (EMSG_console|EMSG_now)),
|
||||
"Setup Level\n" );
|
||||
@@ -1999,18 +2020,69 @@ boolean P_SetupLevel (int to_episod
|
||||
@@ -2116,18 +2137,69 @@ boolean P_SetupLevel (int to_episod
|
||||
goto load_reject;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue