[eureka] 02/03: Do not create "truncated" blockmaps. Instead, leave the BLOCKMAP lump

[Fabian Greffrath]

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

fabian pushed a commit to branch master
in repository eureka.

commit 5fb848f8197924718aecb706c67130461957e389
Author: Fabian Greffrath <fabian at debian.org>
Date:   Sun Feb 7 17:32:50 2016 +0100

    Do not create "truncated" blockmaps. Instead, leave the BLOCKMAP lump
    
    as empty, to allow source ports with internal blockmap generators to
    generate one. Patch from upstream GIT.
---
 ...ry-do-not-create-truncated-blockmaps-whic.patch | 31 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 32 insertions(+)

diff --git a/debian/patches/0001-glBSP-library-do-not-create-truncated-blockmaps-whic.patch b/debian/patches/0001-glBSP-library-do-not-create-truncated-blockmaps-whic.patch
new file mode 100644
index 0000000..a3c9958
--- /dev/null
+++ b/debian/patches/0001-glBSP-library-do-not-create-truncated-blockmaps-whic.patch
@@ -0,0 +1,31 @@
+From 2aa9ee5669b942927727cd2b7c21ccf31e103c7c Mon Sep 17 00:00:00 2001
+From: Andrew Apted <ajapted at users.sf.net>
+Date: Thu, 4 Feb 2016 21:12:10 +1100
+Subject: [PATCH 1/2] glBSP library : do not create "truncated" blockmaps,
+ which rarely allows the map to be playable.  Instead, leave the BLOCKMAP lump
+ as empty, to allow source ports with internal blockmap generators to generate
+ one.
+
+---
+ glbsp_src/blockmap.cc | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/glbsp_src/blockmap.cc b/glbsp_src/blockmap.cc
+index f0ea7e1..d9c880b 100644
+--- a/glbsp_src/blockmap.cc
++++ b/glbsp_src/blockmap.cc
+@@ -592,7 +592,10 @@ void PutBlockmap(void)
+   // of shorts for the actual line lists.
+  
+   if (block_count > cur_info->block_limit)
+-    TruncateBlockmap();
++  {
++    MarkSoftFailure(LIMIT_BLOCKMAP);
++    block_overflowed = TRUE;
++  }
+ 
+   // initial phase: create internal blockmap containing the index of
+   // all lines in each block.
+-- 
+2.7.0.rc3
+
diff --git a/debian/patches/series b/debian/patches/series
index 265de1c..d0980a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 xdg-install.patch
 reproducible-build.patch
+0001-glBSP-library-do-not-create-truncated-blockmaps-whic.patch

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