diff --git a/src/g_input.c b/src/g_input.c index 79e6fb94b93629be6e8527d0e646de1267cf11f4..e9010b39d0580f14000bd802a61aabfe063efda7 100644 --- a/src/g_input.c +++ b/src/g_input.c @@ -16,7 +16,6 @@ #include "g_input.h" #include "keys.h" #include "hu_stuff.h" // need HUFONT start & end -#include "keys.h" #include "d_net.h" #include "console.h" diff --git a/src/p_mobj.c b/src/p_mobj.c index 159edd9fb2313dfb0d42499226da9179737576fb..b3b47f717a421d154035e7beb6ef995b1c46725d 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -9871,7 +9871,7 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing) // Diagonal rings (handles both types) else if (mthing->type == 602 || mthing->type == 603) // Diagonal rings (5) { - angle_t angle = ANGLE_45 * (mthing->angle/45); + angle_t angle = FixedAngle(mthing->angle*FRACUNIT); mobjtype_t ringthing = MT_RING; INT32 iterations = 5; if (mthing->type == 603) diff --git a/src/p_user.c b/src/p_user.c index 44c6f2af40f9dadb3ed13a8682b0f30f8d7f1471..88bbca52332c235b6540ebb4cd2499b6d9d333b3 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -52,9 +52,6 @@ #include "hardware/hw_main.h" #endif -// Index of the special effects (INVUL inverse) map. -#define INVERSECOLORMAP 32 - #if 0 static void P_NukeAllPlayers(player_t *player); #endif diff --git a/src/r_bsp.c b/src/r_bsp.c index c547713be6ae1a7b15ef6fcaef3cf146218c81ac..c87d8baa716328e567ce5978a1ffc0baf21b9ad3 100644 --- a/src/r_bsp.c +++ b/src/r_bsp.c @@ -32,7 +32,6 @@ sector_t *backsector; // 896 drawsegs! So too bad here's a limit removal a-la-Boom drawseg_t *drawsegs = NULL; drawseg_t *ds_p = NULL; -drawseg_t *firstnewseg = NULL; // indicates doors closed wrt automap bugfix: INT32 doorclosed; diff --git a/src/r_bsp.h b/src/r_bsp.h index 20a80d89ab44a00a5125ce4f46d8cbe65ac38f91..14b11ea77bc0dff35f8abf318c5dc1d31e42e857 100644 --- a/src/r_bsp.h +++ b/src/r_bsp.h @@ -30,7 +30,6 @@ extern INT32 checkcoord[12][4]; extern drawseg_t *drawsegs; extern drawseg_t *ds_p; -extern drawseg_t *firstnewseg; extern INT32 doorclosed; typedef void (*drawfunc_t)(INT32 start, INT32 stop); diff --git a/src/r_segs.c b/src/r_segs.c index aacb80b1ecb4aee11ac3f0a059796f789c9c10a6..04873b29cda604ef7fff122520e139b0edc0604f 100644 --- a/src/r_segs.c +++ b/src/r_segs.c @@ -1486,13 +1486,11 @@ void R_StoreWallRange(INT32 start, INT32 stop) if (ds_p == drawsegs+maxdrawsegs) { size_t pos = ds_p - drawsegs; - size_t pos2 = firstnewseg - drawsegs; size_t newmax = maxdrawsegs ? maxdrawsegs*2 : 128; if (firstseg) firstseg = (drawseg_t *)(firstseg - drawsegs); drawsegs = Z_Realloc(drawsegs, newmax*sizeof (*drawsegs), PU_STATIC, NULL); ds_p = drawsegs + pos; - firstnewseg = drawsegs + pos2; maxdrawsegs = newmax; if (firstseg) firstseg = drawsegs + (size_t)firstseg;