diff --git a/SRB2.cbp b/SRB2.cbp
index 5a03955b8..43696ee2e 100644
--- a/SRB2.cbp
+++ b/SRB2.cbp
@@ -3293,23 +3293,6 @@ HW3SOUND for 3D hardware sound support
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/doomdef.h b/src/doomdef.h
index c3a0bfa6e..e6327998a 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -101,6 +101,7 @@
#include
#include
+#define _USE_MATH_DEFINES // fixes M_PI errors in r_plane.c for Visual Studio
#include
#ifdef GETTEXT
@@ -427,10 +428,6 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
// None of these that are disabled in the normal build are guaranteed to work perfectly
// Compile them at your own risk!
-/// Max recursive portal renders
-/// \note obsoleted by cv_maxportals
-//#define PORTAL_LIMIT 8
-
/// Kalaron/Eternity Engine slope code (SRB2CB ported)
#define ESLOPE
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 150af1e08..1a91cae90 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -8557,6 +8557,9 @@ void P_SpawnMapThing(mapthing_t *mthing)
return;
}
+ else if (mthing->type == 750) // Slope vertex point (formerly chaos spawn)
+ return;
+
else if (mthing->type == 300 // Ring
|| mthing->type == 308 || mthing->type == 309 // Team Rings
|| mthing->type == 1706 // Nights Wing
@@ -8590,8 +8593,7 @@ void P_SpawnMapThing(mapthing_t *mthing)
if (i == NUMMOBJTYPES)
{
- if (mthing->type == 3328 // 3D Mode start Thing
- || mthing->type == 750) // Chaos mode spawn
+ if (mthing->type == 3328) // 3D Mode start Thing
return;
CONS_Alert(CONS_WARNING, M_GetText("Unknown thing type %d placed at (%d, %d)\n"), mthing->type, mthing->x, mthing->y);
i = MT_UNKNOWN;
@@ -8899,6 +8901,7 @@ void P_SpawnMapThing(mapthing_t *mthing)
const size_t mthingi = (size_t)(mthing - mapthings);
// Why does P_FindSpecialLineFromTag not work here?!?
+ // Monster Iestyn: tag lists haven't been initialised yet for the map, that's why
for (line = 0; line < numlines; line++)
{
if (lines[line].special == 9 && lines[line].tag == mthing->angle)
@@ -9048,10 +9051,6 @@ ML_NOCLIMB : Direction not controllable
{
if (mthing->options & MTF_OBJECTSPECIAL) // No egg trap for this boss
mobj->flags2 |= MF2_BOSSNOTRAP;
-
- z = ss->sector->floorheight + ((mthing->options >> (ZSHIFT)) << FRACBITS);
-
- mthing->z = (INT16)(z>>FRACBITS);
}
if (i == MT_AXIS || i == MT_AXISTRANSFER || i == MT_AXISTRANSFERLINE) // Axis Points
diff --git a/src/p_setup.c b/src/p_setup.c
index a778469fb..f165aa1e2 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -1888,7 +1888,7 @@ static boolean P_LoadBlockMap(lumpnum_t lumpnum)
//
static void P_GroupLines(void)
{
- size_t i, j, total = 0;
+ size_t i, j;
line_t *li;
sector_t *sector;
subsector_t *ss = subsectors;
@@ -1922,14 +1922,10 @@ static void P_GroupLines(void)
// count number of lines in each sector
for (i = 0, li = lines; i < numlines; i++, li++)
{
- total++;
li->frontsector->linecount++;
if (li->backsector && li->backsector != li->frontsector)
- {
li->backsector->linecount++;
- total++;
- }
}
// allocate linebuffers for each sector
diff --git a/src/r_segs.c b/src/r_segs.c
index 252f6face..0e2b9ea5c 100644
--- a/src/r_segs.c
+++ b/src/r_segs.c
@@ -198,7 +198,7 @@ static void R_DrawWallSplats(void)
// draw the columns
for (dc_x = x1; dc_x <= x2; dc_x++, spryscale += rw_scalestep)
{
- pindex = spryscale>>LIGHTSCALESHIFT;
+ pindex = FixedMul(spryscale, FixedDiv(640, vid.width))>>LIGHTSCALESHIFT;
if (pindex >= MAXLIGHTSCALE)
pindex = MAXLIGHTSCALE - 1;
dc_colormap = walllights[pindex];
@@ -942,7 +942,7 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
else
xwalllights = scalelight[lightnum];
- pindex = spryscale>>LIGHTSCALESHIFT;
+ pindex = FixedMul(spryscale, FixedDiv(640, vid.width))>>LIGHTSCALESHIFT;
if (pindex >= MAXLIGHTSCALE)
pindex = MAXLIGHTSCALE-1;
@@ -1030,7 +1030,7 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
}
// calculate lighting
- pindex = spryscale>>LIGHTSCALESHIFT;
+ pindex = FixedMul(spryscale, FixedDiv(640, vid.width))>>LIGHTSCALESHIFT;
if (pindex >= MAXLIGHTSCALE)
pindex = MAXLIGHTSCALE - 1;
diff --git a/src/r_things.c b/src/r_things.c
index f4e5e07a1..5616c2224 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -1013,7 +1013,7 @@ static void R_SplitSprite(vissprite_t *sprite, mobj_t *thing)
if (!((thing->frame & (FF_FULLBRIGHT|FF_TRANSMASK) || thing->flags2 & MF2_SHADOW)
&& (!newsprite->extra_colormap || !newsprite->extra_colormap->fog)))
{
- lindex = sprite->xscale>>(LIGHTSCALESHIFT);
+ lindex = FixedMul(sprite->xscale, FixedDiv(640, vid.width))>>(LIGHTSCALESHIFT);
if (lindex >= MAXLIGHTSCALE)
lindex = MAXLIGHTSCALE-1;
@@ -1329,7 +1329,7 @@ static void R_ProjectSprite(mobj_t *thing)
else
{
// diminished light
- lindex = xscale>>(LIGHTSCALESHIFT);
+ lindex = FixedMul(xscale, FixedDiv(640, vid.width))>>(LIGHTSCALESHIFT);
if (lindex >= MAXLIGHTSCALE)
lindex = MAXLIGHTSCALE-1;