diff --git a/.circleci/config.yml b/.circleci/config.yml
index c3674a9e5f0b9b85916cbf930d98ee735de5cdd2..1b0cf340761755710dd0cf0edf5567e0df9ff230 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -43,10 +43,13 @@ jobs:
- /var/cache/apt/archives
- checkout
- run:
- name: Compile without network support
- command: make -C src LINUX=1 ERRORMODE=1 -k NONET=1
+ name: Compile without network support and BLUA
+ command: make -C src LINUX=1 ERRORMODE=1 -k NONET=1 NO_LUA=1
- run:
- name: Clean build
+ name: wipe build
+ command: make -C src LINUX=1 cleandep
+ - run:
+ name: rebuild depend
command: make -C src LINUX=1 clean
- restore_cache:
keys:
diff --git a/.travis.yml b/.travis.yml
index 4bfc58860abede871e6481666f97186ce865cc59..15a3c844c1879a8accde781002dd4429d0d24cd5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -221,9 +221,11 @@ matrix:
# - os: osx
# osx_image: xcode7.2
# #Apple LLVM version 7.0.2 (clang-700.1.81)
+# - os: osx
+# osx_image: xcode7.3
+# #Apple LLVM version 7.3.0 (clang-703.0.31)
- os: osx
- osx_image: xcode7.3
- #Apple LLVM version 7.3.0 (clang-703.0.31)
+ #Default: macOS 10.13 and Xcode 9.4.1
allow_failures:
- compiler: clang-3.5
- compiler: clang-3.6
@@ -247,6 +249,16 @@ addons:
- libgl1-mesa-dev
- libgme-dev
- p7zip-full
+ homebrew:
+ taps:
+ - mazmazz/srb2
+ packages:
+ - sdl2_mixer
+ - game-music-emu
+ - p7zip
+ - cmake
+ update: true
+
before_script:
- wget --verbose --server-response -c http://rosenthalcastle.org/srb2/SRB2-v2115-assets-2.7z -O $HOME/srb2_cache/SRB2-v2115-assets-2.7z
@@ -258,9 +270,6 @@ before_script:
- cmake .. -DCMAKE_BUILD_TYPE=Release
before_install:
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install sdl2 sdl2_mixer game-music-emu p7zip; fi
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install cmake||true; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then curl -O -L https://www.libsdl.org/release/SDL2-2.0.6.dmg; hdiutil attach SDL2-2.0.6.dmg; sudo cp -a /Volumes/SDL2/SDL2.framework /Library/Frameworks/; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then curl -O -L https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.1.dmg; hdiutil attach SDL2_mixer-2.0.1.dmg; sudo cp -a /Volumes/SDL2_mixer/SDL2_mixer.framework /Library/Frameworks/; fi
- mkdir -p $HOME/srb2_cache
diff --git a/src/f_finale.c b/src/f_finale.c
index b7c319091fb97c1511fb21292241eee9c94c9a21..8760c5d0da1c0c245ee8518e131ff879afe8463f 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -1192,16 +1192,34 @@ void F_CreditDrawer(void)
if (FixedMul(y,vid.dupy) > vid.height)
break;
}
+}
+
+void F_CreditTicker(void)
+{
+ // "Simulate" the drawing of the credits so that dedicated mode doesn't get stuck
+ UINT16 i;
+ fixed_t y = (80<<FRACBITS) - 5*(animtimer<<FRACBITS)/8;
+ // Draw credits text on top
+ for (i = 0; credits[i]; i++)
+ {
+ switch(credits[i][0])
+ {
+ case 0: y += 80<<FRACBITS; break;
+ case 1: y += 30<<FRACBITS; break;
+ default: y += 12<<FRACBITS; break;
+ }
+ if (FixedMul(y,vid.dupy) > vid.height)
+ break;
+ }
+
+ // Do this here rather than in the drawer you doofus! (this is why dedicated mode broke at credits)
if (!credits[i] && y <= 120<<FRACBITS && !finalecount)
{
timetonext = 5*TICRATE+1;
finalecount = 5*TICRATE;
}
-}
-void F_CreditTicker(void)
-{
if (timetonext)
timetonext--;
else
diff --git a/src/p_inter.c b/src/p_inter.c
index 009a2be1f68f959f149fbf0f250f1bbc6df56e13..29450f6e1d075833d10b199faf87e128b8c040cc 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -2643,7 +2643,7 @@ static void P_KillPlayer(player_t *player, mobj_t *source, INT32 damage)
}
}
-static inline void P_SuperDamage(player_t *player, mobj_t *inflictor, mobj_t *source, INT32 damage)
+static void P_SuperDamage(player_t *player, mobj_t *inflictor, mobj_t *source, INT32 damage)
{
fixed_t fallbackspeed;
angle_t ang;
diff --git a/src/r_segs.c b/src/r_segs.c
index 748365264e468be8bc6401be96201e283277e373..7495d78890ec8d100c514a4de7d0eb3e85c8c14c 100644
--- a/src/r_segs.c
+++ b/src/r_segs.c
@@ -862,16 +862,18 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
leftheight -= viewz;
rightheight -= viewz;
-#define OVERFLOWTEST(height, scale) \
- overflow_test = (INT64)centeryfrac - (((INT64)height*scale)>>FRACBITS); \
- if (overflow_test < 0) overflow_test = -overflow_test; \
- if ((UINT64)overflow_test&0xFFFFFFFF80000000ULL) continue;
-
- OVERFLOWTEST(leftheight, ds->scale1)
- OVERFLOWTEST(rightheight, ds->scale2)
-
- rlight->height = (centeryfrac) - FixedMul(leftheight, ds->scale1);
- rlight->heightstep = (centeryfrac) - FixedMul(rightheight, ds->scale2);
+#define CLAMPMAX INT32_MAX
+#define CLAMPMIN (-INT32_MAX) // This is not INT32_MIN on purpose! INT32_MIN makes the drawers freak out.
+ // Monster Iestyn (25/03/18): do not skip these lights if they fail overflow test, just clamp them instead so they behave.
+ overflow_test = (INT64)centeryfrac - (((INT64)leftheight*ds->scale1)>>FRACBITS);
+ if (overflow_test > (INT64)CLAMPMAX) rlight->height = CLAMPMAX;
+ else if (overflow_test > (INT64)CLAMPMIN) rlight->height = (fixed_t)overflow_test;
+ else rlight->height = CLAMPMIN;
+
+ overflow_test = (INT64)centeryfrac - (((INT64)rightheight*ds->scale2)>>FRACBITS);
+ if (overflow_test > (INT64)CLAMPMAX) rlight->heightstep = CLAMPMAX;
+ else if (overflow_test > (INT64)CLAMPMIN) rlight->heightstep = (fixed_t)overflow_test;
+ else rlight->heightstep = CLAMPMIN;
rlight->heightstep = (rlight->heightstep-rlight->height)/(range);
#else
if (light->height < *pfloor->bottomheight)
@@ -893,12 +895,16 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
leftheight -= viewz;
rightheight -= viewz;
- OVERFLOWTEST(leftheight, ds->scale1)
- OVERFLOWTEST(rightheight, ds->scale2)
-#undef OVERFLOWTEST
+ // Monster Iestyn (25/03/18): do not skip these lights if they fail overflow test, just clamp them instead so they behave.
+ overflow_test = (INT64)centeryfrac - (((INT64)leftheight*ds->scale1)>>FRACBITS);
+ if (overflow_test > (INT64)CLAMPMAX) rlight->botheight = CLAMPMAX;
+ else if (overflow_test > (INT64)CLAMPMIN) rlight->botheight = (fixed_t)overflow_test;
+ else rlight->botheight = CLAMPMIN;
- rlight->botheight = (centeryfrac) - FixedMul(leftheight, ds->scale1);
- rlight->botheightstep = (centeryfrac) - FixedMul(rightheight, ds->scale2);
+ overflow_test = (INT64)centeryfrac - (((INT64)rightheight*ds->scale2)>>FRACBITS);
+ if (overflow_test > (INT64)CLAMPMAX) rlight->botheightstep = CLAMPMAX;
+ else if (overflow_test > (INT64)CLAMPMIN) rlight->botheightstep = (fixed_t)overflow_test;
+ else rlight->botheightstep = CLAMPMIN;
rlight->botheightstep = (rlight->botheightstep-rlight->botheight)/(range);
#else
lheight = *light->caster->bottomheight;// > *pfloor->topheight ? *pfloor->topheight + FRACUNIT : *light->caster->bottomheight;
@@ -1071,9 +1077,6 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
}
#endif
-#define CLAMPMAX INT32_MAX
-#define CLAMPMIN (-INT32_MAX) // This is not INT32_MIN on purpose! INT32_MIN makes the drawers freak out.
-
// draw the columns
for (dc_x = x1; dc_x <= x2; dc_x++)
{