Merge pull request #4056 from s1eve-mcdichae1/dukepatch

eduke32.sh - patch a gameplay bug in e4m4

Author: cmitu

scriptmodules/ports/eduke32.sh

@@ -41,6 +41,8 @@ function sources_eduke32() {
     applyPatch "$md_data/0004-recast-function.patch"
     # cherry-picked commit fixing a game bug in E1M4 (shrinker ray stuck)
     applyPatch "$md_data/0005-e1m4-shrinker-bug.patch"
+    # two more commits r8241 + r8247 fixing a bug in E4M4 (instant death in water)
+    applyPatch "$md_data/0006-e4m4-water-bug.patch"
 }
 
 function build_eduke32() {

scriptmodules/ports/eduke32/0006-e4m4-water-bug.patch

@@ -0,0 +1,29 @@
+diff --git a/source/build/src/clip.cpp b/source/build/src/clip.cpp
+index 24eb02368..1a7b57bb5 100644
+--- a/source/build/src/clip.cpp
++++ b/source/build/src/clip.cpp
+@@ -945,14 +945,22 @@ static int get_floorspr_clipyou(vec2_t const v1, vec2_t const v2, vec2_t const v
+     return clipyou;
+ }
+ 
+-static void clipupdatesector(vec2_t const pos, int16_t * const sectnum, int const walldist)
++static void clipupdatesector(vec2_t const pos, int16_t * const sectnum, int walldist)
+ {
+     if (inside_p(pos.x, pos.y, *sectnum))
+         return;
+ 
++    int16_t nsecs = min<int16_t>(getsectordist(pos, *sectnum), INT16_MAX);
++
++    if (nsecs > (walldist + 8))
++    {
++        OSD_Printf("%s():%d shortest distance between origin point (%d, %d) and sector %d is %d. Sector may be corrupt!\n",
++                   EDUKE32_FUNCTION, __LINE__, pos.x, pos.y, *sectnum, nsecs);
++        walldist = 0x7fff;
++    }
++
+     static int16_t sectlist[MAXSECTORS];
+     static uint8_t sectbitmap[(MAXSECTORS+7)>>3];
+-    int16_t        nsecs;
+ 
+     bfirst_search_init(sectlist, sectbitmap, &nsecs, MAXSECTORS, *sectnum);
+