diff --git a/src/blan/internal/b_soc.c b/src/blan/internal/b_soc.c
index f4c2c46b2..2eb085daa 100644
--- a/src/blan/internal/b_soc.c
+++ b/src/blan/internal/b_soc.c
@@ -12,10 +12,10 @@
 // Map header toggle for wall transfering.
 boolean B_UseWallTransfer(void)
 {
-    const mapheader_t *mapheader = mapheaderinfo[gamemap - 1];
+	const mapheader_t *mapheader = mapheaderinfo[gamemap - 1];
 
-    if (cv_kartwalltransfer.value)
-        return true;
+	if (cv_kartwalltransfer.value)
+		return true;
     
 	if (mapheader->use_walltransfer == true)
 		return true;
diff --git a/src/byteptr.h b/src/byteptr.h
index 8130ba6c1..ee73e02d0 100644
--- a/src/byteptr.h
+++ b/src/byteptr.h
@@ -127,7 +127,7 @@ FUNCINLINE static ATTRINLINE UINT32 readulong(void *ptr)
 #define READANGLE(p)        readulong(&((angle_t*)(p = (void*)&((angle_t*)p)[1]))[-1])
 #endif //SRB2_BIG_ENDIAN
 
-#define WRITESTRINGN(p, s, n) {                            \
+#define WRITESTRINGN(p, s, n) {                             \
 	size_t tmp_i;                                           \
                                                             \
 	for (tmp_i = 0; tmp_i < n && s[tmp_i] != '\0'; tmp_i++) \
diff --git a/src/d_main.c b/src/d_main.c
index a8db92e8d..f2af8e891 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -147,6 +147,7 @@ char srb2path[256] = ".";
 boolean usehome = true;
 const char *pandf = "%s" PATHSEP "%s";
 static char addonsdir[MAX_WADPATH];
+char downloaddir[sizeof addonsdir + sizeof DOWNLOADDIR_PART] = "DOWNLOAD";
 
 //
 // EVENT HANDLING
@@ -1348,7 +1349,7 @@ void D_SRB2Main(void)
 
 	/* and downloads in a subdirectory */
 	snprintf(downloaddir, sizeof downloaddir, "%s%s%s",
-			addonsdir, PATHSEP, "downloads");
+			addonsdir, PATHSEP, DOWNLOADDIR_PART);
 
 	// rand() needs seeded regardless of password
 	srand((unsigned int)time(NULL));
diff --git a/src/d_netfil.c b/src/d_netfil.c
index a56eab9d1..52c9e3ec4 100644
--- a/src/d_netfil.c
+++ b/src/d_netfil.c
@@ -111,7 +111,6 @@ static filetran_t transfer[MAXNETNODES];
 INT32 fileneedednum; // Number of files needed to join the server
 fileneeded_t fileneeded[MAX_WADFILES]; // List of needed files
 static tic_t lasttimeackpacketsent = 0;
-char downloaddir[512] = "DOWNLOAD";
 
 // For resuming failed downloads
 typedef struct
diff --git a/src/d_netfil.h b/src/d_netfil.h
index 8016535f7..2b751a59e 100644
--- a/src/d_netfil.h
+++ b/src/d_netfil.h
@@ -62,7 +62,8 @@ struct fileneeded_t
 
 extern INT32 fileneedednum;
 extern fileneeded_t fileneeded[MAX_WADFILES];
-extern char downloaddir[512];
+#define DOWNLOADDIR_PART "downloads"
+extern char downloaddir[];
 
 #ifndef NONET
 extern INT32 lastfilenum;
diff --git a/src/f_wipe.c b/src/f_wipe.c
index e54b15aa5..c6daebc77 100644
--- a/src/f_wipe.c
+++ b/src/f_wipe.c
@@ -98,7 +98,6 @@ INT32 lastwipetic = 0;
 static UINT8 *wipe_scr_start; //screen 3
 static UINT8 *wipe_scr_end; //screen 4
 static UINT8 *wipe_scr; //screen 0 (main drawing)
-static UINT8 pallen;
 static fixed_t paldiv;
 
 /** Create fademask_t from lump
@@ -344,51 +343,6 @@ void F_WipeEndScreen(void)
 #endif
 }
 
-/**	Wiggle post processor for encore wipes
-  */
-static void F_DoEncoreWiggle(UINT8 time)
-{
-	UINT8 *tmpscr = wipe_scr_start;
-	UINT8 *srcscr = wipe_scr;
-	angle_t disStart = (time * 128) & FINEMASK;
-	INT32 y, sine, newpix, scanline;
-
-	for (y = 0; y < vid.height; y++)
-	{
-		sine = (FINESINE(disStart) * (time*12))>>FRACBITS;
-		scanline = y / vid.dupy;
-		if (scanline & 1)
-			sine = -sine;
-		newpix = abs(sine);
-
-		if (sine < 0)
-		{
-			M_Memcpy(&tmpscr[(y*vid.width)+newpix], &srcscr[(y*vid.width)], vid.width-newpix);
-
-			// Cleanup edge
-			while (newpix)
-			{
-				tmpscr[(y*vid.width)+newpix] = srcscr[(y*vid.width)];
-				newpix--;
-			}
-		}
-		else
-		{
-			M_Memcpy(&tmpscr[(y*vid.width)], &srcscr[(y*vid.width) + sine], vid.width-newpix);
-
-			// Cleanup edge
-			while (newpix)
-			{
-				tmpscr[(y*vid.width) + vid.width - newpix] = srcscr[(y*vid.width) + (vid.width-1)];
-				newpix--;
-			}
-		}
-
-		disStart += (time*8); //the offset into the displacement map, increment each game loop
-		disStart &= FINEMASK; //clip it to FINEMASK
-	}
-}
-
 /** Draw the stage title.
   */
 void F_WipeStageTitle(void)
diff --git a/src/g_game.c b/src/g_game.c
index 6f4897120..bd15f454f 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -2183,9 +2183,6 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
 	UINT16 followercolor;
 	
 	mobj_t *follower; // old follower, will probably be removed by the time we're dead but you never know.
-	mobj_t *skyboxviewpoint;
-	mobj_t *skyboxcenterpoint;
-
 	
 	INT32 charflags;
 	UINT32 followitem;
@@ -2381,7 +2378,6 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
 	else
 	{
 		follower = NULL;
-		skyboxviewpoint = skyboxcenterpoint = NULL;
 	}
 	
 	spectatorreentry = players[player].spectatorreentry;
diff --git a/src/hardware/hw_cache.c b/src/hardware/hw_cache.c
index 8f007762e..80b1069fc 100644
--- a/src/hardware/hw_cache.c
+++ b/src/hardware/hw_cache.c
@@ -477,7 +477,7 @@ static void HWR_GenerateTexture(GLMapTexture_t *grtex, INT32 texnum, boolean noe
 	grtex->mipmap.height = (UINT16)texture->height;
 	grtex->mipmap.format = textureformat;
 
-	if (encoremap && R_TextureCanRemap(texnum))
+	if (!noencoremap && encoremap)
 		colormap += COLORMAP_REMAPOFFSET;
 
 	grtex->mipmap.colormap = Z_Calloc(sizeof(*grtex->mipmap.colormap), PU_HWRPATCHCOLMIPMAP, NULL);
diff --git a/src/hardware/hw_light.c b/src/hardware/hw_light.c
index 0e278674a..a7126a146 100644
--- a/src/hardware/hw_light.c
+++ b/src/hardware/hw_light.c
@@ -51,9 +51,6 @@ static dynlights_t *dynlights = &view_dynlights[0];
 //#define AMMO_SPR        8
 //#define BONUS_SPR      16
 
-// BP: big hack for a test in lighning ref : 1249753487AB
-static fixed_t *hwbbox;
-
 //Hurdler: now we can change those values via FS :)
 light_t lspr[NUMLIGHTS] =
 {
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index 177fd616b..cf9689a97 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -1761,7 +1761,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 
 				if (!(rover->fofflags & FOF_EXISTS) || !(rover->fofflags & FOF_RENDERSIDES))
 					continue;
-				if (udmf && !(rover->fofflags & FOF_ALLSIDES) && rover->fofflags & FOF_INVERTSIDES || !udmf && rover->fofflags & FOF_INVERTSIDES)
+				if ((udmf && !(rover->fofflags & FOF_ALLSIDES) && rover->fofflags & FOF_INVERTSIDES) || (!udmf && rover->fofflags & FOF_INVERTSIDES))
 					continue;
 
 				SLOPEPARAMS(*rover->t_slope, high1, highslope1, *rover->topheight)
@@ -1774,7 +1774,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 
 				if (rover->master->flags & ML_TFERLINE)
 				{
-					size_t linenum = min(gl_curline->linedef-gl_backsector->lines[0], rover->master->frontsector->linecount);
+					size_t linenum = min(gl_curline->linedef-gl_backsector->lines[0], (long int)rover->master->frontsector->linecount);
 					newline = rover->master->frontsector->lines[0] + linenum;
 					texnum = R_GetTextureNum(sides[newline->sidenum[0]].midtexture);
 				}
@@ -1921,7 +1921,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 
 				if (!(rover->fofflags & FOF_EXISTS) || !(rover->fofflags & FOF_RENDERSIDES))
 					continue;
-				if (udmf && !(rover->fofflags & FOF_ALLSIDES) && rover->fofflags & FOF_INVERTSIDES || !udmf && rover->fofflags & FOF_INVERTSIDES)
+				if ((udmf && !(rover->fofflags & FOF_ALLSIDES) && rover->fofflags & FOF_INVERTSIDES) || (!udmf && rover->fofflags & FOF_INVERTSIDES))
 					continue;
 
 				SLOPEPARAMS(*rover->t_slope, high1, highslope1, *rover->topheight)
@@ -1934,7 +1934,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 
 				if (rover->master->flags & ML_TFERLINE)
 				{
-					size_t linenum = min(gl_curline->linedef-gl_backsector->lines[0], rover->master->frontsector->linecount);
+					size_t linenum = min(gl_curline->linedef-gl_backsector->lines[0], (long int)rover->master->frontsector->linecount);
 					newline = rover->master->frontsector->lines[0] + linenum;
 					texnum = R_GetTextureNum(sides[newline->sidenum[0]].midtexture);
 				}
@@ -2851,7 +2851,7 @@ static void HWR_Subsector(size_t num)
 
 			if (centerHeight <= locCeilingHeight &&
 			    centerHeight >= locFloorHeight &&
-			    ((dup_viewz < cullHeight && (udmf && rover->fofflags & FOF_BOTHPLANES || !(rover->fofflags & FOF_INVERTPLANES))) ||
+			    ((dup_viewz < cullHeight && ((udmf && rover->fofflags & FOF_BOTHPLANES) || !(rover->fofflags & FOF_INVERTPLANES))) ||
 			     (dup_viewz > cullHeight && (rover->fofflags & FOF_BOTHPLANES || rover->fofflags & FOF_INVERTPLANES))))
 			{
 				if (rover->fofflags & FOF_FOG)
@@ -2899,7 +2899,7 @@ static void HWR_Subsector(size_t num)
 
 			if (centerHeight >= locFloorHeight &&
 			    centerHeight <= locCeilingHeight &&
-			    ((dup_viewz > cullHeight && (udmf && rover->fofflags & FOF_BOTHPLANES || !(rover->fofflags & FOF_INVERTPLANES))) ||
+			    ((dup_viewz > cullHeight && ((udmf && rover->fofflags & FOF_BOTHPLANES) || !(rover->fofflags & FOF_INVERTPLANES))) ||
 			     (dup_viewz < cullHeight && (rover->fofflags & FOF_BOTHPLANES || rover->fofflags & FOF_INVERTPLANES))))
 			{
 				if (rover->fofflags & FOF_FOG)
@@ -4393,7 +4393,7 @@ void HWR_AddTransparentFloor(levelflat_t *levelflat, extrasubsector_t *xsub, boo
 
 	planeinfo[numplanes].isceiling = isceiling;
 	planeinfo[numplanes].fixedheight = fixedheight;
-	planeinfo[numplanes].lightlevel = (planecolormap && (planecolormap->flags & CMF_FOG) || !udmf) ? lightlevel : 255;
+	planeinfo[numplanes].lightlevel = ((planecolormap && (planecolormap->flags & CMF_FOG)) || !udmf) ? lightlevel : 255;
 	planeinfo[numplanes].levelflat = levelflat;
 	planeinfo[numplanes].xsub = xsub;
 	planeinfo[numplanes].alpha = alpha;
@@ -4424,7 +4424,7 @@ void HWR_AddTransparentPolyobjectFloor(levelflat_t *levelflat, polyobj_t *polyse
 
 	polyplaneinfo[numpolyplanes].isceiling = isceiling;
 	polyplaneinfo[numpolyplanes].fixedheight = fixedheight;
-	polyplaneinfo[numpolyplanes].lightlevel = (planecolormap && (planecolormap->flags & CMF_FOG) || !udmf) ? lightlevel : 255;
+	polyplaneinfo[numpolyplanes].lightlevel = ((planecolormap && (planecolormap->flags & CMF_FOG)) || !udmf) ? lightlevel : 255;
 	polyplaneinfo[numpolyplanes].levelflat = levelflat;
 	polyplaneinfo[numpolyplanes].polysector = polysector;
 	polyplaneinfo[numpolyplanes].alpha = alpha;
diff --git a/src/info.c b/src/info.c
index a3fc7ffc0..21665b844 100644
--- a/src/info.c
+++ b/src/info.c
@@ -28096,7 +28096,7 @@ skincolor_t skincolors[MAXSKINCOLORS] = {
 	{"Byzantium",       {201, 248, 249, 250, 251, 252, 253, 254, 255, 255,  29,  29,  30,  30,  31,  31}, SKINCOLOR_SWAMP,8,        V_LAVENDERMAP,                   true}, // SKINCOLOR_BYZANTIUM
 	{"Pomegranate",     {144, 145, 146, 147, 148, 149, 150, 251, 251, 252, 252, 253, 254, 255,  29,  30}, SKINCOLOR_DREAM,8,        V_LAVENDERMAP,                   true}, // SKINCOLOR_POMEGRANATE
 	{"Lilac",           {120, 120, 120, 121, 121, 122, 122, 123, 192, 248, 249, 250, 251, 252, 253, 254}, SKINCOLOR_JAWZ,6,          V_PINKMAP,        true}, // SKINCOLOR_LILAC
-	{"Bone",            {120, 120,   0,   1,   3,   5,   7,  10,  12,  14,  16,  19,  22,  24,  26,  29}, SKINCOLOR_INK,8,           0-                true}, // SKINCOLOR_BONE
+	{"Bone",            {120, 120,   0,   1,   3,   5,   7,  10,  12,  14,  16,  19,  22,  24,  26,  29}, SKINCOLOR_INK,8,           0,                true}, // SKINCOLOR_BONE
 	{"Carbon",          {  3,   6,  10,  13,  17,  20,  22,  23,  24,  25,  26,  27,  28,  29,  30,  31}, SKINCOLOR_MARBLE,8,        V_GRAYMAP,         true}, // SKINCOLOR_CARBON
 	{"Ink",             {  0,   2,   5,  10,  15,  20,  25,  26,  27,  28,  30,  30,  30,  31,  31,  31}, SKINCOLOR_BONE,8,          V_GRAYMAP,         true}, // SKINCOLOR_INK
 	{"Ghost",           {120, 120,   0,   1,   1, 224, 225, 225, 226, 202, 203, 204, 205, 206, 207,  29}, SKINCOLOR_PEACHY,12,       0,                true}, // SKINCOLOR_GHOST
diff --git a/src/k_bot.c b/src/k_bot.c
index 5c7873fda..2be56d643 100644
--- a/src/k_bot.c
+++ b/src/k_bot.c
@@ -1005,135 +1005,6 @@ static INT32 K_HandleBotTrack(player_t *player, ticcmd_t *cmd, botprediction_t *
 	return turnamt;
 }
 
-/*--------------------------------------------------
-	static INT32 K_HandleBotReverse(player_t *player, ticcmd_t *cmd, botprediction_t *predict)
-
-		Determines inputs for reversing.
-
-	Input Arguments:-
-		player - Player to generate the ticcmd for.
-		cmd - The player's ticcmd to modify.
-		predict - Pointer to the bot's prediction.
-
-	Return:-
-		New value for turn amount.
---------------------------------------------------*/
-static INT32 K_HandleBotReverse(player_t *player, ticcmd_t *cmd, botprediction_t *predict, angle_t destangle)
-{
-	// Handle steering towards waypoints!
-	INT32 turnamt = 0;
-	SINT8 turnsign = 0;
-	angle_t moveangle, angle;
-	INT16 anglediff, momdiff;
-
-	if (predict != NULL)
-	{
-		// TODO: Should we reverse through bot controllers?
-		return K_HandleBotTrack(player, cmd, predict, destangle);
-	}
-
-	if (player->nextwaypoint == NULL
-		|| player->nextwaypoint->mobj == NULL
-		|| P_MobjWasRemoved(player->nextwaypoint->mobj))
-	{
-		// No data available...
-		return 0;
-	}
-
-	if ((player->nextwaypoint->prevwaypoints != NULL)
-		&& (player->nextwaypoint->numprevwaypoints > 0U))
-	{
-		size_t i;
-		for (i = 0U; i < player->nextwaypoint->numprevwaypoints; i++)
-		{
-			if (!K_GetWaypointIsEnabled(player->nextwaypoint->prevwaypoints[i]))
-			{
-				continue;
-			}
-
-			destangle = R_PointToAngle2(
-				player->nextwaypoint->prevwaypoints[i]->mobj->x, player->nextwaypoint->prevwaypoints[i]->mobj->y,
-				player->nextwaypoint->mobj->x, player->nextwaypoint->mobj->y
-			);
-
-			break;
-		}
-	}
-
-	// Calculate turn direction first.
-	moveangle = player->mo->angle;
-	angle = (moveangle - destangle);
-
-	if (angle < ANGLE_180)
-	{
-		turnsign = -1; // Turn right
-		anglediff = AngleFixed(angle)>>FRACBITS;
-	}
-	else 
-	{
-		turnsign = 1; // Turn left
-		anglediff = 360-(AngleFixed(angle)>>FRACBITS);
-	}
-
-	anglediff = abs(anglediff);
-	turnamt = KART_FULLTURN * turnsign;
-
-	// Now calculate momentum
-	momdiff = 180;
-	if (player->speed > player->mo->scale)
-	{
-		momdiff = 0;
-		moveangle = K_MomentumAngle(player->mo);
-		angle = (moveangle - destangle);
-
-		if (angle < ANGLE_180)
-		{
-			momdiff = AngleFixed(angle)>>FRACBITS;
-		}
-		else 
-		{
-			momdiff = 360-(AngleFixed(angle)>>FRACBITS);
-		}
-
-		momdiff = abs(momdiff);
-	}
-
-	if (anglediff > 90 || momdiff < 90)
-	{
-		// We're not facing the track,
-		// or we're going too fast.
-		// Let's E-Brake.
-		cmd->forwardmove = 0;
-		cmd->buttons |= BT_ACCELERATE|BT_BRAKE;
-	}
-	else
-	{
-		fixed_t slopeMul = FRACUNIT;
-
-		if (player->mo->standingslope != NULL)
-		{
-			const pslope_t *slope = player->mo->standingslope;
-
-			if (!(slope->flags & SL_NOPHYSICS) && abs(slope->zdelta) >= FRACUNIT/21)
-			{
-				angle_t sangle = player->mo->angle - slope->xydirection;
-
-				if (P_MobjFlip(player->mo) * slope->zdelta < 0)
-					sangle ^= ANGLE_180;
-
-				slopeMul = FRACUNIT - FINECOSINE(sangle >> ANGLETOFINESHIFT);
-			}
-		}
-
-		if (anglediff < 10)
-		{
-			turnamt = 0;
-		}
-	}
-
-	return turnamt;
-}
-
 /*--------------------------------------------------
 	static void K_BuildBotTiccmdNormal(player_t *player, ticcmd_t *cmd)
 
@@ -1295,14 +1166,6 @@ static void K_BuildBotTiccmdNormal(player_t *player, ticcmd_t *cmd)
 --------------------------------------------------*/
 void K_BuildBotTiccmd(player_t *player, ticcmd_t *cmd)
 {
-	precise_t t = 0;
-	botprediction_t *predict = NULL;
-	boolean trySpindash = true;
-	angle_t destangle = 0;
-	UINT8 spindash = 0;
-	INT32 turnamt = 0;
-	const line_t *botController = player->botvars.controller != UINT16_MAX ? &lines[player->botvars.controller] : NULL;
-
 	// Remove any existing controls
 	memset(cmd, 0, sizeof(ticcmd_t));
 
diff --git a/src/k_botitem.c b/src/k_botitem.c
index 72bd490bb..0a79f7e5d 100644
--- a/src/k_botitem.c
+++ b/src/k_botitem.c
@@ -170,7 +170,6 @@ static player_t *K_PlayerPredictThrow(player_t *player, UINT8 extra)
 	const fixed_t dist = (30 + (extra * 10)) * player->mo->scale;
 	const UINT32 airtime = FixedDiv(dist + player->mo->momz, gravity);
 	fixed_t throwspeed;
-	UINT8 gsv;
 	fixed_t estx;
 	fixed_t esty;
 	
diff --git a/src/k_director.c b/src/k_director.c
index 3cb1b403d..6ba86b0d9 100644
--- a/src/k_director.c
+++ b/src/k_director.c
@@ -96,7 +96,6 @@ static void K_UpdateDirectorPositions(void)
 
 static boolean K_CanSwitchDirector(void)
 {
-	INT32 *displayplayerp = &displayplayers[0];
 
 	if (directorinfo.cooldown > 0)
 	{
diff --git a/src/k_follower.c b/src/k_follower.c
index d9facdcf6..29e2ed1a1 100644
--- a/src/k_follower.c
+++ b/src/k_follower.c
@@ -358,7 +358,7 @@ void K_HandleFollower(player_t *player)
 			break;
 	}
 
-	if (color == 0 || color > MAXSKINCOLORS+2) // Make sure this isn't garbage
+	if (color == 0 || color > numskincolors+2) // Make sure this isn't garbage
 	{
 		color = player->skincolor; // "Match" as fallback.
 	}
diff --git a/src/k_hud.c b/src/k_hud.c
index f49e49268..f179b82fb 100644
--- a/src/k_hud.c
+++ b/src/k_hud.c
@@ -68,14 +68,7 @@ static patch_t *kp_splitspheresticker;
 static patch_t *kp_splitkarmabomb;
 static patch_t *kp_timeoutsticker;
 
-static patch_t *kp_prestartbulb[15];
-static patch_t *kp_prestartletters[7];
-
-static patch_t *kp_prestartbulb_split[15];
-static patch_t *kp_prestartletters_split[7];
-
 static patch_t *kp_startcountdown[20];
-static patch_t *kp_racefault[6];
 static patch_t *kp_racefinish[6];
 
 static patch_t *kp_positionnum[NUMPOSNUMS][NUMPOSFRAMES];
@@ -1738,7 +1731,7 @@ static boolean K_drawKartPositionFaces(void)
 	INT32 i, j, ranklines, strank = -1;
 	boolean completed[MAXPLAYERS];
 	INT32 rankplayer[MAXPLAYERS];
-	INT32 bumperx, emeraldx, numplayersingame = 0;
+	INT32 bumperx, /*emeraldx,*/ numplayersingame = 0;
 	UINT8 *colormap;
 
 	ranklines = 0;
@@ -1822,7 +1815,7 @@ static boolean K_drawKartPositionFaces(void)
 		if (!players[rankplayer[i]].mo) continue;
 
 		bumperx = FACE_X+19;
-		emeraldx = FACE_X+16;
+		//emeraldx = FACE_X+16;
 
 		if (players[rankplayer[i]].mo->color)
 		{
@@ -2007,7 +2000,7 @@ static void K_drawBossHealthBar(void)
 
 static void K_drawKartEmeralds(void)
 {
-	static const INT32 emeraldOffsets[7][3] = {
+	/*static const INT32 emeraldOffsets[7][3] = {
 		{34, 0, 15},
 		{25, 8, 11},
 		{43, 8, 19},
@@ -2015,12 +2008,12 @@ static void K_drawKartEmeralds(void)
 		{52, 0, 23},
 		{ 7, 8,  3},
 		{61, 8, 27}
-	};
+	};*/
 
 	INT32 splitflags = V_SNAPTOBOTTOM|V_SNAPTORIGHT|V_SPLITSCREEN;
 	INT32 startx = BASEVIDWIDTH - 77;
 	INT32 starty = BASEVIDHEIGHT - 29;
-	INT32 i = 0, xindex = 0;
+	//INT32 i = 0, xindex = 0;
 
 	{
 		if (r_splitscreen)
@@ -2040,7 +2033,7 @@ static void K_drawKartEmeralds(void)
 		}
 		else
 		{
-			xindex = 2;
+			//xindex = 2;
 			starty -= 15;
 			if (stplyr == &players[displayplayers[0]] || stplyr == &players[displayplayers[2]])	// If we are P1 or P3...
 			{
diff --git a/src/k_kart.c b/src/k_kart.c
index 07c225bc0..dbfac6a59 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -1977,7 +1977,7 @@ static SINT8 K_GlanceAtPlayers(player_t *glancePlayer)
 
 	\return	void
 */
-void K_RespawnChecker(player_t *player)
+static void K_RespawnChecker(player_t *player)
 {
 	ticcmd_t *cmd = &player->cmd;
 
@@ -6915,8 +6915,6 @@ void K_KartResetPlayerColor(player_t *player)
 
 	if (player->invincibilitytimer) // You're gonna kiiiiill
 	{
-		const tic_t defaultTime = itemtime+(2*TICRATE);
-		tic_t flicker = 2;
 		boolean skip = false;
 
 		fullbright = true;
@@ -7448,7 +7446,7 @@ static void K_UpdateDistanceFromFinishLine(player_t *player)
 				// left after this one. This will give us the total distance to the finish line, and allow item
 				// distance calculation to work easily
 				const mapheader_t *mapheader = mapheaderinfo[gamemap - 1];
-				if ((mapheaderinfo[gamemap - 1]->levelflags & LF_SECTIONRACE) == 0U)
+				if ((mapheader->levelflags & LF_SECTIONRACE) == 0U)
 				{
 					const UINT8 numfulllapsleft = ((UINT8)numlaps - player->laps);
 					player->distancetofinish += numfulllapsleft * K_GetCircuitLength();
@@ -8172,7 +8170,6 @@ static void K_AirFailsafe(player_t *player)
 static void K_AdjustPlayerFriction(player_t *player)
 {
 	boolean onground = P_IsObjectOnGround(player->mo);
-	fixed_t basefriction = ORIG_FRICTION;
 	// JugadorXEI: Do *not* calculate friction when a player is pogo'd
 	// because they'll be in the air and friction will not reset!
 	if (onground && !player->pogospring)
diff --git a/src/k_terrain.c b/src/k_terrain.c
index 01f6a44d3..ae0275e05 100644
--- a/src/k_terrain.c
+++ b/src/k_terrain.c
@@ -745,7 +745,6 @@ void K_ProcessTerrainEffect(mobj_t *mo)
 		fixed_t minspeed = terrain->pogoSpringMin*hscale;
 		fixed_t maxspeed = terrain->pogoSpringMax*hscale;
 		angle_t pushangle = FixedHypot(player->mo->momx, player->mo->momy) ? R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy) : player->mo->angle;
-		sector_t *sector = player->mo->subsector->sector;
 
 		if (terrain->pogoSpring == 2)
 			player->pogospring = 2;
@@ -1278,7 +1277,7 @@ void K_UpdateTerrainOverlay(mobj_t *mo)
 		fixed_t speedDiv = FRACUNIT + FixedMul(FixedDiv(speed, maxSpeed), o->speed);
 		tic_t animSpeed = max(FixedDiv(mo->state->tics, speedDiv), 1);
 
-		mo->tics = min(mo->tics, animSpeed);
+		mo->tics = min(mo->tics, (INT32)animSpeed);
 	}
 }
 
diff --git a/src/k_waypoint.h b/src/k_waypoint.h
index 7cc1e47d9..39de98e2c 100644
--- a/src/k_waypoint.h
+++ b/src/k_waypoint.h
@@ -55,6 +55,21 @@ struct waypoint_t
 waypoint_t *K_GetFinishLineWaypoint(void);
 
 
+/*--------------------------------------------------
+	waypoint_t *K_GetStartingWaypoint(void);
+
+		Return the waypoint farthest from the finish line.
+
+	Input Arguments:-
+		None
+
+	Return:-
+		The waypoint that is being used as the startingwaypoint.
+--------------------------------------------------*/
+
+waypoint_t *K_GetStartingWaypoint(void);
+
+
 /*--------------------------------------------------
 	boolean K_GetWaypointIsFinishline(waypoint_t *waypoint)
 
@@ -143,6 +158,19 @@ INT32 K_GetWaypointNextID(waypoint_t *waypoint);
 --------------------------------------------------*/
 INT32 K_GetWaypointID(waypoint_t *waypoint);
 
+/*--------------------------------------------------
+	waypoint_t *K_GetWaypointFromID(INT32 waypointID)
+
+		Returns the first waypoint with the specified ID.
+
+	Input Arguments:-
+		waypointID - The ID of the waypoint to get
+
+	Return:-
+		The first waypoint with this ID, NULL if the ID doesn't exist at all in the map
+--------------------------------------------------*/
+
+waypoint_t *K_GetWaypointFromID(INT32 waypointID);
 
 /*--------------------------------------------------
 	UINT32 K_GetCircuitLength(void)
@@ -157,6 +185,22 @@ INT32 K_GetWaypointID(waypoint_t *waypoint);
 UINT32 K_GetCircuitLength(void);
 
 
+/*--------------------------------------------------
+	INT32 K_GetTrackComplexity(void)
+
+		Returns the track complexity values. This depends
+		on how many turns the map has, and is used for
+		bot code to determine their rubberbanding.
+
+	Input Arguments:-
+
+	Return:-
+		The track complexity value.
+--------------------------------------------------*/
+
+INT32 K_GetTrackComplexity(void);
+
+
 /*--------------------------------------------------
 	waypoint_t *K_GetClosestWaypointToMobj(mobj_t *const mobj)
 
@@ -250,6 +294,36 @@ boolean K_PathfindThruCircuit(
 	const boolean     huntbackwards);
 
 
+/*--------------------------------------------------
+	boolean K_PathfindThruCircuitSpawnable(
+		waypoint_t *const sourcewaypoint,
+		const UINT32      traveldistance,
+		path_t *const     returnpath,
+		const boolean     useshortcuts,
+		const boolean     huntbackwards)
+
+		The same as K_PathfindThruCircuit, but continues until hitting a waypoint that
+		can be respawned at.
+
+	Input Arguments:-
+		sourcewaypoint      - The waypoint to start searching from
+		traveldistance      - How far along the circuit it will try to pathfind.
+		returnpath          - The path_t that will contain the final found path
+		useshortcuts        - Whether to use waypoints that are marked as being shortcuts in the search
+		huntbackwards       - Goes through the waypoints backwards if true
+
+	Return:-
+		True if a circuit path could be constructed, false if it couldn't.
+--------------------------------------------------*/
+
+boolean K_PathfindThruCircuitSpawnable(
+	waypoint_t *const sourcewaypoint,
+	const UINT32      traveldistance,
+	path_t *const     returnpath,
+	const boolean     useshortcuts,
+	const boolean     huntbackwards);
+
+
 /*--------------------------------------------------
 	waypoint_t *K_GetNextWaypointToDestination(
 		waypoint_t *const sourcewaypoint,
diff --git a/src/lua_maplib.c b/src/lua_maplib.c
index 744a6d6a4..4033b35e3 100644
--- a/src/lua_maplib.c
+++ b/src/lua_maplib.c
@@ -2518,12 +2518,12 @@ static int mapheaderinfo_get(lua_State *L)
 		lua_pushstring(L, header->keywords);
 	else if (fastcmp(field,"musname")) // we create a table here because it saves us from a userdata nightmare
 	{
-		UINT8 i;
+		UINT8 j;
 		lua_createtable(L, header->musname_size, 0);
-		for (i = 0; i < header->musname_size; i++)
+		for (j = 0; j < header->musname_size; j++)
 		{
-			lua_pushstring(L, header->musname[i]);
-			lua_rawseti(L, -2, 1 + i);
+			lua_pushstring(L, header->musname[j]);
+			lua_rawseti(L, -2, 1 + j);
 		}
 	}
 	else if (fastcmp(field,"mustrack"))
diff --git a/src/m_cond.c b/src/m_cond.c
index 7475894d4..275d11c12 100644
--- a/src/m_cond.c
+++ b/src/m_cond.c
@@ -152,11 +152,11 @@ emblem_t emblemlocations[MAXEMBLEMS] =
 // Default Extra Emblems
 extraemblem_t extraemblems[MAXEXTRAEMBLEMS] =
 {
-	{"Novice",    "Play 100 matches",  10, 'C', SKINCOLOR_RED, 0},
-	{"Standard",  "Play 250 matches",  11, 'C', SKINCOLOR_RED, 0},
-	{"Expert",    "Play 500 matches",  12, 'C', SKINCOLOR_RED, 0},
-	{"Master",    "Play 750 matches",  13, 'C', SKINCOLOR_RED, 0},
-	{"Nightmare", "Play 1000 matches", 14, 'C', SKINCOLOR_RED, 0},
+	{"Novice",    "Play 100 matches",  10, 'C', 0,SKINCOLOR_RED, 0},
+	{"Standard",  "Play 250 matches",  11, 'C', 0,SKINCOLOR_RED, 0},
+	{"Expert",    "Play 500 matches",  12, 'C', 0,SKINCOLOR_RED, 0},
+	{"Master",    "Play 750 matches",  13, 'C', 0,SKINCOLOR_RED, 0},
+	{"Nightmare", "Play 1000 matches", 14, 'C', 0,SKINCOLOR_RED, 0},
 };
 
 // Unlockables
diff --git a/src/m_menu.c b/src/m_menu.c
index 46862fefc..5d2ce9623 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -5414,7 +5414,7 @@ static void PrepReplayList(void)
 		else
 		{
 			demolist[i].type = MD_NOTLOADED;
-			snprintf(demolist[i].filepath, 255, "%s%s", menupath, dirmenu[i] + DIR_STRING);
+			snprintf(demolist[i].filepath, 1024, "%s%s", menupath, dirmenu[i] + DIR_STRING);
 			sprintf(demolist[i].title, ".....");
 		}
 	}
diff --git a/src/p_enemy.c b/src/p_enemy.c
index b54d709bf..603f8d1e2 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -3820,8 +3820,6 @@ void A_AttractChase(mobj_t *actor)
 
 			if (actor->extravalue1 >= 21)
 			{
-				mobj_t *sparkle;
-				angle_t offset = FixedAngle(18<<FRACBITS);
 
 				// Base add is 3 tics for 9,9, adds 1 tic for each point closer to the 1,1 end
 				actor->target->player->ringboost += K_GetKartRingPower(actor->target->player, true) + 3;
@@ -3907,8 +3905,8 @@ void A_AttractChase(mobj_t *actor)
 			actor->cusval = 1;
 
 			if (
-				actor->tracer->player && actor->tracer->health
-				&& (gametyperules & GTR_SPHERES)
+				(actor->tracer->player && actor->tracer->health
+				&& (gametyperules & GTR_SPHERES))
 					|| (actor->tracer->player->itemtype == KITEM_LIGHTNINGSHIELD
 					&& RINGTOTAL(actor->tracer->player) < 20
 					&& !(actor->tracer->player->pflags & PF_RINGLOCK))
@@ -13300,24 +13298,6 @@ void A_JawzExplode(mobj_t *actor)
 	return;
 }
 
-static void SpawnSPBTrailRings(mobj_t *actor)
-{
-	I_Assert(actor != NULL);
-
-	if (leveltime % 6 == 0)
-	{
-		if (leveltime % (actor->extravalue1 == 2 ? 6 : 3) == 0)	// Extravalue1 == 2 is seeking mode. Because the SPB is about twice as fast as normal in that mode, also spawn the rings twice as often to make up for it!
-		{
-			mobj_t *ring = P_SpawnMobj(actor->x - actor->momx, actor->y - actor->momy,
-				actor->z - actor->momz + (24*mapobjectscale), MT_RING);
-			ring->threshold = 10;
-			ring->fuse = 35*TICRATE;
-			ring->colorized = true;
-			ring->color = SKINCOLOR_RED;
-		}
-	}
-}
-
 void A_SPBChase(mobj_t *actor)
 {
 	player_t *player = NULL;
diff --git a/src/p_inter.c b/src/p_inter.c
index e75cd1660..2ca39b6c6 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -1368,7 +1368,6 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget
 					P_InstaThrust(kart, kartFlingAngle, 1 * kart->scale);
 					P_SetObjectMomZ(kart, 10*FRACUNIT, false);
 
-					const fixed_t tireOffset = 32;
 					const angle_t aOffset = ANGLE_22h;
 
 					UINT8 i;
@@ -1422,11 +1421,6 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget
 
 		case MT_ITEMCAPSULE:
 		{
-			UINT8 i;
-			mobj_t *attacker = inflictor ? inflictor : source;
-			mobj_t *part = target->hnext;
-			angle_t angle = FixedAngle(360*P_RandomFixed());
-			INT16 spacing = (target->radius >> 1) / target->scale;
 
 			// set respawn fuse
 			if (modeattacking) // no respawns
@@ -1827,7 +1821,8 @@ static boolean P_PlayerHitsPlayer(mobj_t *target, mobj_t *inflictor, mobj_t *sou
 static boolean P_KillPlayer(player_t *player, mobj_t *inflictor, mobj_t *source, UINT8 type)
 {
 	(void)source;
-
+	(void)inflictor;
+	
 	if (player->respawn)
 	{
 		K_DoInstashield(player);
diff --git a/src/p_map.c b/src/p_map.c
index b3ff2324f..f3a93ddb5 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -293,8 +293,8 @@ P_DoSpringEx
 //
 boolean P_DoSpring(mobj_t *spring, mobj_t *object)
 {
-	const fixed_t hscale = mapobjectscale + (mapobjectscale - object->scale);
-	const fixed_t vscale = mapobjectscale + (object->scale - mapobjectscale);
+	//const fixed_t hscale = mapobjectscale + (mapobjectscale - object->scale);
+	//const fixed_t vscale = mapobjectscale + (object->scale - mapobjectscale);
 	fixed_t offx, offy;
 	fixed_t vertispeed = spring->info->mass;
 	fixed_t horizspeed = spring->info->damage;
diff --git a/src/p_maputl.c b/src/p_maputl.c
index 07fcd381d..7a4e65d98 100644
--- a/src/p_maputl.c
+++ b/src/p_maputl.c
@@ -430,9 +430,9 @@ P_GetMidtextureTopBottom
 	fixed_t textop, texbottom, texheight;
 	INT32 texnum = R_GetTextureNum(side->midtexture); // make sure the texture is actually valid
 
-	sector_t *front = linedef->frontsector;
-	sector_t *back = linedef->backsector;
-	fixed_t z;
+	//sector_t *front = linedef->frontsector;
+	//sector_t *back = linedef->backsector;
+	//fixed_t z;
 
 	if (!texnum)
 		return false;
diff --git a/src/p_mobj.c b/src/p_mobj.c
index b54702004..84a375bd3 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -4115,9 +4115,7 @@ static void P_RefreshItemCapsuleParts(mobj_t *mobj)
 	INT32 count = 0;
 	INT32 itemType = mobj->threshold;
 	mobj_t *part;
-	skincolornum_t color;
 	UINT32 newRenderFlags = 0;
-	boolean colorized;
 
 	if (itemType < 1 || itemType >= NUMKARTITEMS)
 		itemType = KITEM_SAD;
@@ -4126,8 +4124,6 @@ static void P_RefreshItemCapsuleParts(mobj_t *mobj)
 	while (!P_MobjWasRemoved(part->hnext))
 	{
 		part = part->hnext;
-		part->color = color;
-		part->colorized = colorized;
 		part->renderflags = (part->renderflags & ~RF_BRIGHTMASK) | newRenderFlags;
 	}
 
@@ -4213,7 +4209,6 @@ static void P_RefreshItemCapsuleParts(mobj_t *mobj)
 #define ROTATIONSPEED (2*ANG2)
 static void P_SpawnItemCapsuleParts(mobj_t *mobj)
 {
-	UINT8 i;
 	mobj_t *part;
 
 	// inside item
@@ -11150,7 +11145,7 @@ fixed_t P_GetMobjSpawnHeight(
                     M_AATreeIteratorNext(it);
             }
 
-            fixed_t result = M_AATreeIteratorKey(it) + finalZOffset;
+            //fixed_t result = M_AATreeIteratorKey(it) + finalZOffset;
 
             M_AATreeIteratorClose(it);
             M_AATreeFree(heights);
@@ -11283,6 +11278,7 @@ static boolean P_AllowMobjSpawn(mapthing_t* mthing, mobjtype_t i)
 		case MT_RING:
 			if (ringsdisabled)
 				return false;
+			break;
 		case MT_ITEMCAPSULE:
 			{
 				boolean isRingCapsule = (mthing->args[0] < 1 || mthing->args[0] == KITEM_SUPERRING || mthing->args[0] >= NUMKARTITEMS);
@@ -12301,6 +12297,7 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
 
 		P_RemoveMobj(mobj); // Don't need this helper obj anymore
 		return false;
+		break;
 	}
 	case MT_BATTLECAPSULE:
 	{
@@ -12424,6 +12421,7 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
 
 		// Increment no. of capsules on the map counter
 		maptargets++;
+		break;
 	}
 	case MT_LOOPCENTERPOINT:
 	{
diff --git a/src/p_mobj.h b/src/p_mobj.h
index 11cc036d9..c05f5beed 100644
--- a/src/p_mobj.h
+++ b/src/p_mobj.h
@@ -444,7 +444,7 @@ struct precipmobj_t
 	// Info for drawing: position.
 	fixed_t x, y, z;
 	// --- Please make sure you keep the fields up to this
-	// --- point in sync with degenmobj_t.\
+	// --- point in sync with degenmobj_t.
 
 	fixed_t old_x, old_y, old_z; // position interpolation
 	fixed_t old_x2, old_y2, old_z2;
diff --git a/src/p_setup.c b/src/p_setup.c
index 80117d352..7e70cc5e8 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -1287,7 +1287,7 @@ static void P_WriteDuplicateText(const char *text, char **target)
 	M_Memcpy(*target, text, len);
 }
 
-static void P_WriteSkincolor(INT32 constant, char **target)
+/*static void P_WriteSkincolor(INT32 constant, char **target)
 {
 	if (constant <= SKINCOLOR_NONE
 	|| constant >= (INT32)numskincolors)
@@ -1297,7 +1297,7 @@ static void P_WriteSkincolor(INT32 constant, char **target)
 		va("SKINCOLOR_%s", skincolors[constant].name),
 		target
 	);
-}
+}*/
 
 static void P_WriteSfx(INT32 constant, char **target)
 {
diff --git a/src/p_spec.c b/src/p_spec.c
index ea8ed9d85..f88480fa2 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -2020,7 +2020,7 @@ static void K_HandleLapIncrement(player_t *player, boolean fromsector)
 			
 
 				{
-					UINT8 prevLowest = lowestLap;
+					//UINT8 prevLowest = lowestLap;
 
 					lowestLap = P_FindLowestLap();
 				}
@@ -6388,6 +6388,7 @@ static void P_AddRaiseThinker(sector_t *sec, INT16 tag, fixed_t speed, fixed_t c
 
 static void P_AddAirbob(sector_t *sec, INT16 tag, fixed_t dist, boolean raise, boolean spindash, boolean dynamic)
 {
+	(void)spindash;
 	raise_t *airbob;
 
 	airbob = Z_Calloc(sizeof (*airbob), PU_LEVSPEC, NULL);
@@ -6683,7 +6684,7 @@ static boolean P_IsLineDisabled (const line_t * line)
 {
 	if (line->special != 7) // This is a hack. I can at least hope nobody wants to prevent flat alignment in netgames...
 	{
-		const INT16 NETONLY = udmf ? ML_NETONLY : ML_NETONLY_OLD;
+		const UINT32 NETONLY = udmf ? ML_NETONLY : ML_NETONLY_OLD;
 
 		if (netgame)
 		{
diff --git a/src/p_tick.c b/src/p_tick.c
index 4dac2a099..35207af38 100644
--- a/src/p_tick.c
+++ b/src/p_tick.c
@@ -876,7 +876,7 @@ void P_Ticker(boolean run)
 			G_WriteAllGhostTics();
 
 			if (cv_recordmultiplayerdemos.value && (demo.savemode == DSM_NOTSAVING || demo.savemode == DSM_WILLAUTOSAVE))
-				if (demo.savebutton && demo.savebutton + 3*TICRATE < leveltime && PlayerInputDown(1, gc_lookback) || (cv_usejoystick[0].value && axis > 0))
+				if ((demo.savebutton && demo.savebutton + 3*TICRATE < leveltime && PlayerInputDown(1, gc_lookback)) || (cv_usejoystick[0].value && axis > 0))
 					demo.savemode = DSM_TITLEENTRY;
 		}
 		else if (demo.playback) // Use Ghost data for consistency checks.
diff --git a/src/p_user.c b/src/p_user.c
index 080dd8a4e..f4620e093 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -1426,6 +1426,7 @@ static boolean P_PlayerCanBust(player_t *player, ffloor_t *rover)
 	// TODO: Make these act like the Lua SA2 boxes.
 	// (void)player;
 	(void)rover;
+	(void)player;
 
 	if (!(rover->fofflags & FOF_EXISTS))
 		return false;
@@ -1982,11 +1983,10 @@ static void P_UpdatePlayerAngle(player_t *player)
 {
 	INT16 angle_diff, max_left_turn, max_right_turn;
 	boolean add_delta = true;
-	fixed_t currentSpeed = 0;
 	ticcmd_t *cmd = &player->cmd;
 	angle_t anglechange = player->angleturn;
 	int i;
-	UINT8 p = UINT8_MAX;
+	//UINT8 p = UINT8_MAX;
 
 	// Kart: store the current turn range for later use
 	if (((player->mo && player->speed > 0) // Moving
@@ -2789,7 +2789,7 @@ static ticcmd_t *P_CameraCmd(camera_t *cam)
 		turnright = turnright || (axis > 0);
 		turnleft = turnleft || (axis < 0);
 	}
-	forward = 0;
+	forward = side = 0;
 
 	cmd->turning = 0;
 
diff --git a/src/r_bsp.c b/src/r_bsp.c
index 149336ce6..560f3077f 100644
--- a/src/r_bsp.c
+++ b/src/r_bsp.c
@@ -545,7 +545,7 @@ static void R_AddLine(seg_t *line)
 #undef SLOPEPARAMS
 
 
-		if (udmf || !udmf && viewsector != backsector && viewsector != frontsector)
+		if (udmf || (!udmf && viewsector != backsector && viewsector != frontsector))
 		{
 			// if both ceilings are skies, consider it always "open"
 			// same for floors
@@ -584,7 +584,7 @@ static void R_AddLine(seg_t *line)
 	}
 	else
 	{
-		if (udmf || !udmf && viewsector != backsector && viewsector != frontsector)
+		if (udmf || (!udmf && viewsector != backsector && viewsector != frontsector))
 		{
 			// if both ceilings are skies, consider it always "open"
 			// same for floors
diff --git a/src/r_main.c b/src/r_main.c
index 7e4879833..05fec4c6f 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -143,21 +143,13 @@ static CV_PossibleValue_t maxportals_cons_t[] = {{0, "MIN"}, {12, "MAX"}, {0, NU
 static CV_PossibleValue_t homremoval_cons_t[] = {{0, "No"}, {1, "Yes"}, {2, "Flash"}, {0, NULL}};
 
 static void Fov_OnChange(void);
-static void ChaseCam_OnChange(void);
-static void ChaseCam2_OnChange(void);
-static void ChaseCam3_OnChange(void);
-static void ChaseCam4_OnChange(void);
-static void FlipCam_OnChange(void);
-static void FlipCam2_OnChange(void);
-static void FlipCam3_OnChange(void);
-static void FlipCam4_OnChange(void);
 
 consvar_t cv_tailspickup = CVAR_INIT ("tailspickup", "On", CV_NETVAR|CV_NOSHOWHELP, CV_OnOff, NULL);
 consvar_t cv_chasecam[MAXSPLITSCREENPLAYERS] = {
-	CVAR_INIT ("chasecam", "On", CV_CALL, CV_OnOff, ChaseCam_OnChange),
-	CVAR_INIT ("chasecam2", "On", CV_CALL, CV_OnOff, ChaseCam2_OnChange),
-	CVAR_INIT ("chasecam3", "On", CV_CALL, CV_OnOff, ChaseCam3_OnChange),
-	CVAR_INIT ("chasecam4", "On", CV_CALL, CV_OnOff, ChaseCam4_OnChange)
+	CVAR_INIT ("chasecam", "On", 0, CV_OnOff, NULL),
+	CVAR_INIT ("chasecam2", "On", 0, CV_OnOff, NULL),
+	CVAR_INIT ("chasecam3", "On", 0, CV_OnOff, NULL),
+	CVAR_INIT ("chasecam4", "On", 0, CV_OnOff, NULL)
 };
 
 consvar_t cv_flipcam[MAXSPLITSCREENPLAYERS] = {
@@ -247,26 +239,6 @@ static void Fov_OnChange(void)
 	R_SetViewSize();
 }
 
-static void ChaseCam_OnChange(void)
-{
-	;
-}
-
-static void ChaseCam2_OnChange(void)
-{
-	;
-}
-
-static void ChaseCam3_OnChange(void)
-{
-	;
-}
-
-static void ChaseCam4_OnChange(void)
-{
-	;
-}
-
 //
 // R_PointOnSide
 // Traverse BSP (sub) tree,
@@ -1384,13 +1356,13 @@ void R_SkyboxFrame(int s)
 	newview->y = r_viewmobj->y;
 	if (!udmf)
     {
-        if (r_viewmobj->spawnpoint)
-            newview->z = ((fixed_t)r_viewmobj->spawnpoint->angle)<<FRACBITS;
-        else
-            newview->z = 0;
+		if (r_viewmobj->spawnpoint)
+			newview->z = ((fixed_t)r_viewmobj->spawnpoint->angle)<<FRACBITS;
+		else
+			newview->z = 0;
     }
-    else
-        newview->z = r_viewmobj->z; // 26/04/17: use actual Z position instead of spawnpoint angle!
+	else
+		newview->z = r_viewmobj->z; // 26/04/17: use actual Z position instead of spawnpoint angle!
 
 	if (mapheaderinfo[gamemap-1])
 	{
diff --git a/src/r_portal.c b/src/r_portal.c
index 4a8ac4261..0711394d0 100644
--- a/src/r_portal.c
+++ b/src/r_portal.c
@@ -275,15 +275,15 @@ void Portal_AddSkybox (const visplane_t* plane)
 	portal->viewz = skyboxmo[0]->z;
 	portal->viewangle = viewangle + skyboxmo[0]->angle;
 
-    if (!udmf)
-    {
-        if (skyboxmo[0]->spawnpoint)
-            portal->viewz = ((fixed_t)skyboxmo[0]->spawnpoint->angle)<<FRACBITS;
-        else
-            portal->viewz = 0;
-    }
-    else
-        portal->viewz = skyboxmo[0]->z; // 26/04/17: use actual Z position instead of spawnpoint angle!
+	if (!udmf)
+	{
+		if (skyboxmo[0]->spawnpoint)
+			portal->viewz = ((fixed_t)skyboxmo[0]->spawnpoint->angle)<<FRACBITS;
+		else
+			portal->viewz = 0;
+	}
+	else
+		portal->viewz = skyboxmo[0]->z; // 26/04/17: use actual Z position instead of spawnpoint angle!
 
 	mh = mapheaderinfo[gamemap-1];
 
diff --git a/src/r_segs.c b/src/r_segs.c
index 5c7797abd..e2fcfe157 100644
--- a/src/r_segs.c
+++ b/src/r_segs.c
@@ -610,7 +610,7 @@ static INT32 R_GetTwoSidedMidTexture(seg_t *line)
 	return R_GetTextureNum(texture);
 }
 
-static boolean R_CheckBlendMode(const line_t *ldef, boolean brightmapped)
+/*static boolean R_CheckBlendMode(const line_t *ldef, boolean brightmapped)
 {
 	transnum_t transtable = NUMTRANSMAPS;
 	patchalphastyle_t blendmode = AST_COPY;
@@ -655,13 +655,13 @@ static boolean R_CheckBlendMode(const line_t *ldef, boolean brightmapped)
 	}
 
 	return true;
-}
+}*/
 
 void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2)
 {
 	INT32 texnum;
 	void (*colfunc_2s)(column_t *, column_t *, INT32);
-	line_t *ldef;
+	//line_t *ldef;
 	// Calculate light table.
 	// Use different light tables
 	//   for horizontal / vertical / diagonal. Diagonal?
@@ -673,7 +673,7 @@ void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2)
 	texnum = R_GetTwoSidedMidTexture(curline);
 	windowbottom = windowtop = sprbotscreen = INT32_MAX;
 
-	ldef = curline->linedef;
+	//ldef = curline->linedef;
 
 	rw_scalestep = ds->scalestep;
 	spryscale = ds->scale1 + (x1 - ds->x1)*rw_scalestep;
@@ -790,7 +790,7 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
 
 	if (pfloor->master->flags & ML_TFERLINE)
 	{
-		size_t linenum = min(curline->linedef-backsector->lines[0], pfloor->master->frontsector->linecount);
+		size_t linenum = min(curline->linedef-backsector->lines[0], (long int)pfloor->master->frontsector->linecount);
 		newline = pfloor->master->frontsector->lines[0] + linenum;
 		texnum = R_GetTextureNum(sides[newline->sidenum[0]].midtexture);
 	}
@@ -1746,7 +1746,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 	vertex_t segleft, segright;
 	fixed_t ceilingfrontslide, floorfrontslide, ceilingbackslide, floorbackslide;
 	static size_t maxdrawsegs = 0;
-	const INT32 twosidedmidtexture = R_GetTwoSidedMidTexture(curline);
+	//const INT32 twosidedmidtexture = R_GetTwoSidedMidTexture(curline);
 	const boolean wantremap = encoremap && !(curline->linedef->flags & ML_TFERLINE);
 
 	maskedtextureheight = NULL;
@@ -2089,9 +2089,9 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 		//SoM: 3/25/2000: This code fixes an automap bug that didn't check
 		// frontsector->ceiling and backsector->floor to see if a door was closed.
 		// Without the following code, sprites get displayed behind closed doors.
-		if (!bothceilingssky && !bothfloorssky || !udmf)
+		if ((!bothceilingssky && !bothfloorssky) || !udmf)
 		{
-			if (udmf || !udmf && viewsector != frontsector && viewsector != backsector)
+			if (udmf || (!udmf && viewsector != frontsector && viewsector != backsector))
 			{
 				if (doorclosed || (worldhigh <= worldbottom && worldhighslope <= worldbottomslope))
 				{
@@ -2174,7 +2174,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 			markceiling = false;
 		}
 
-		if (!bothceilingssky && !bothfloorssky || !udmf)
+		if ((!bothceilingssky && !bothfloorssky) || !udmf)
 		{
 			if (((worldhigh <= worldbottom && worldhighslope <= worldbottomslope)
 				|| (worldlow >= worldtop && worldlowslope >= worldtopslope)) || (!udmf && (backsector->ceilingheight <= frontsector->floorheight ||
@@ -2276,7 +2276,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 				{
 					if (!(rover->fofflags & FOF_RENDERSIDES) || !(rover->fofflags & FOF_EXISTS))
 						continue;
-					if (udmf && !(rover->fofflags & FOF_ALLSIDES) && rover->fofflags & FOF_INVERTSIDES || !udmf && rover->fofflags & FOF_INVERTSIDES)
+					if ((udmf && !(rover->fofflags & FOF_ALLSIDES) && rover->fofflags & FOF_INVERTSIDES) || (!udmf && rover->fofflags & FOF_INVERTSIDES))
 						continue;
 
 					if (rover->norender == leveltime)
@@ -2334,7 +2334,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 				{
 					if (!(rover->fofflags & FOF_RENDERSIDES) || !(rover->fofflags & FOF_EXISTS))
 						continue;
-					if (udmf && !(rover->fofflags & FOF_ALLSIDES) && rover->fofflags & FOF_INVERTSIDES || !udmf && rover->fofflags & FOF_INVERTSIDES)
+					if ((udmf && !(rover->fofflags & FOF_ALLSIDES) && rover->fofflags & FOF_INVERTSIDES) || (!udmf && rover->fofflags & FOF_INVERTSIDES))
 						continue;
 
 					if (rover->norender == leveltime)
@@ -2394,7 +2394,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 				{
 					if (!(rover->fofflags & FOF_RENDERSIDES) || !(rover->fofflags & FOF_EXISTS))
 						continue;
-					if (udmf && !(rover->fofflags & FOF_ALLSIDES) && rover->fofflags & FOF_INVERTSIDES || !udmf && rover->fofflags & FOF_INVERTSIDES)
+					if ((udmf && !(rover->fofflags & FOF_ALLSIDES) && rover->fofflags & FOF_INVERTSIDES) || (!udmf && rover->fofflags & FOF_INVERTSIDES))
 						continue;
 					if (rover->norender == leveltime)
 						continue;
@@ -2416,7 +2416,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 				{
 					if (!(rover->fofflags & FOF_RENDERSIDES) || !(rover->fofflags & FOF_EXISTS))
 						continue;
-					if (udmf && !(rover->fofflags & FOF_ALLSIDES) && rover->fofflags & FOF_INVERTSIDES || !udmf && rover->fofflags & FOF_INVERTSIDES)
+					if ((udmf && !(rover->fofflags & FOF_ALLSIDES) && rover->fofflags & FOF_INVERTSIDES) || (!udmf && rover->fofflags & FOF_INVERTSIDES))
 						continue;
 					if (rover->norender == leveltime)
 						continue;
@@ -2738,7 +2738,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 
 					if ((roverleft>>4 <= worldhigh || roverright>>4 <= worldhighslope) &&
 					    (roverleft>>4 >= worldlow || roverright>>4 >= worldlowslope) &&
-					    ((viewz < planevistest && (udmf && rover->fofflags & FOF_BOTHPLANES || !(rover->fofflags & FOF_INVERTPLANES))) ||
+					    ((viewz < planevistest && ((udmf && rover->fofflags & FOF_BOTHPLANES) || !(rover->fofflags & FOF_INVERTPLANES))) ||
 					     (viewz > planevistest && (rover->fofflags & FOF_BOTHPLANES || rover->fofflags & FOF_INVERTPLANES))))
 					{
 						//ffloor[i].slope = *rover->b_slope;
@@ -2761,7 +2761,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 
 					if ((roverleft>>4 <= worldhigh || roverright>>4 <= worldhighslope) &&
 					    (roverleft>>4 >= worldlow || roverright>>4 >= worldlowslope) &&
-					    ((viewz > planevistest && (udmf && rover->fofflags & FOF_BOTHPLANES || !(rover->fofflags & FOF_INVERTPLANES))) ||
+					    ((viewz > planevistest && ((udmf && rover->fofflags & FOF_BOTHPLANES) || !(rover->fofflags & FOF_INVERTPLANES))) ||
 					     (viewz < planevistest && (rover->fofflags & FOF_BOTHPLANES || rover->fofflags & FOF_INVERTPLANES))))
 					{
 						//ffloor[i].slope = *rover->t_slope;
@@ -2795,7 +2795,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 
 					if ((roverleft>>4 <= worldhigh || roverright>>4 <= worldhighslope) &&
 					    (roverleft>>4 >= worldlow || roverright>>4 >= worldlowslope) &&
-					    ((viewz < planevistest && (udmf && rover->fofflags & FOF_BOTHPLANES || !(rover->fofflags & FOF_INVERTPLANES))) ||
+					    ((viewz < planevistest && ((udmf && rover->fofflags & FOF_BOTHPLANES) || !(rover->fofflags & FOF_INVERTPLANES))) ||
 					     (viewz > planevistest && (rover->fofflags & FOF_BOTHPLANES || rover->fofflags & FOF_INVERTPLANES))))
 					{
 						//ffloor[i].slope = *rover->b_slope;
@@ -2818,7 +2818,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 
 					if ((roverleft>>4 <= worldhigh || roverright>>4 <= worldhighslope) &&
 					    (roverleft>>4 >= worldlow || roverright>>4 >= worldlowslope) &&
-					    ((viewz > planevistest && (udmf && rover->fofflags & FOF_BOTHPLANES || !(rover->fofflags & FOF_INVERTPLANES))) ||
+					    ((viewz > planevistest && ((udmf && rover->fofflags & FOF_BOTHPLANES) || !(rover->fofflags & FOF_INVERTPLANES))) ||
 					     (viewz < planevistest && (rover->fofflags & FOF_BOTHPLANES || rover->fofflags & FOF_INVERTPLANES))))
 					{
 						//ffloor[i].slope = *rover->t_slope;
diff --git a/src/r_things.c b/src/r_things.c
index d23e70c57..b6004ed02 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -1048,6 +1048,7 @@ static void R_DrawVisSprite(vissprite_t *vis)
 			if (bmpatch)
 				bmcol = (column_t *)((UINT8 *)bmpatch->columns + (bmpatch->columnofs[texturecolumn]));
 #else
+			texturecolumn = CLAMP(frac >> FRACBITS, 0, patch->width - 1);
 			column = (column_t *)((UINT8 *)patch->columns + (patch->columnofs[frac>>FRACBITS]));
 			if (bmpatch)
 				bmcol = (column_t *)((UINT8 *)bmpatch->columns + (bmpatch->columnofs[texturecolumn]));
@@ -1073,6 +1074,7 @@ static void R_DrawVisSprite(vissprite_t *vis)
 			if (bmpatch)
 				bmcol = (column_t *)((UINT8 *)bmpatch->columns + (bmpatch->columnofs[texturecolumn]));
 #else
+			texturecolumn = CLAMP(frac >> FRACBITS, 0, patch->width - 1);
 			column = (column_t *)((UINT8 *)patch->columns + (patch->columnofs[frac>>FRACBITS]));
 			if (bmpatch)
 				bmcol = (column_t *)((UINT8 *)bmpatch->columns + (bmpatch->columnofs[texturecolumn]));
diff --git a/src/s_sound.c b/src/s_sound.c
index e95c110ed..463fdd5a4 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -2162,7 +2162,7 @@ static void S_UnloadMusic(void)
 }
 
 /* Don't Play content id unsafe music pls */
-static boolean S_CheckMusicIsSafe()
+static boolean S_CheckMusicIsSafe(void)
 {
 	if (cv_streamersafemusic.value)
 	{
@@ -2504,7 +2504,7 @@ void S_InitLevelMusic(boolean fromnetsave)
 			{
 				if (mapheaderinfo[gamemap-1]->musname_size > 1)
 				{
-					UINT32 random = P_RandomFixed();
+					P_RandomFixed();
 				}
 				// mapmusrng has already been set by the demo; just make sure it's valid
 				if (mapmusrng >= mapheaderinfo[gamemap-1]->musname_size)
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index 3405738cf..93c333159 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -296,7 +296,7 @@ static void write_backtrace(INT32 signal)
 
 static void I_ShowErrorMessageBox(const char *messagefordevelopers, boolean dumpmade)
 {
-	static char finalmessage[1024];
+	static char finalmessage[2048];
 	size_t firstimpressionsline = 3; // "Dr Robotnik's Ring Racers" has encountered...
 
 	if (M_CheckParm("-dedicated"))
@@ -621,7 +621,7 @@ static void I_StartupConsole(void)
 void I_GetConsoleEvents(void)
 {
 	// we use this when sending back commands
-	event_t ev = {0,0,0,0};
+	event_t ev = {0,0,0,0,0};
 	char key = 0;
 	ssize_t d;
 
@@ -1155,7 +1155,7 @@ void I_ShutdownJoystick(UINT8 index)
 
 void I_GetJoystickEvents(UINT8 index)
 {
-	static event_t event = {0,0,0,0};
+	static event_t event = {0,0,0,0,0};
 	INT32 i = 0;
 	UINT64 joyhats = 0;
 #if 0
diff --git a/src/sdl12/i_system.c b/src/sdl12/i_system.c
index a5a950cfb..e77f567a6 100644
--- a/src/sdl12/i_system.c
+++ b/src/sdl12/i_system.c
@@ -539,7 +539,7 @@ static void I_StartupConsole(void)
 void I_GetConsoleEvents(void)
 {
 	// we use this when sending back commands
-	event_t ev = {0,0,0,0};
+	event_t ev = {0,0,0,0,0};
 	char key = 0;
 	ssize_t d;
 
@@ -601,7 +601,7 @@ static boolean entering_con_command = false;
 
 void I_GetConsoleEvents(void)
 {
-	event_t ev = {0,0,0,0};
+	event_t ev = {0,0,0,0,0};
 	HANDLE ci = GetStdHandle(STD_INPUT_HANDLE);
 	HANDLE co = GetStdHandle(STD_OUTPUT_HANDLE);
 	CONSOLE_SCREEN_BUFFER_INFO CSBI;
@@ -1033,7 +1033,7 @@ static void I_ShutdownJoystick(void)
 
 void I_GetJoystickEvents(void)
 {
-	static event_t event = {0,0,0,0};
+	static event_t event = {0,0,0,0,0};
 	INT32 i = 0;
 	UINT64 joyhats = 0;
 #if 0
@@ -1328,7 +1328,7 @@ static void I_ShutdownJoystick2(void)
 
 void I_GetJoystick2Events(void)
 {
-	static event_t event = {0,0,0,0};
+	static event_t event = {0,0,0,0,0};
 	INT32 i = 0;
 	UINT64 joyhats = 0;
 #if 0
@@ -1621,7 +1621,7 @@ static void I_ShutdownJoystick3(void)
 
 void I_GetJoystick3Events(void)
 {
-	static event_t event = {0,0,0,0};
+	static event_t event = {0,0,0,0,0};
 	INT32 i = 0;
 	UINT64 joyhats = 0;
 #if 0
@@ -1914,7 +1914,7 @@ static void I_ShutdownJoystick4(void)
 
 void I_GetJoystick4Events(void)
 {
-	static event_t event = {0,0,0,0};
+	static event_t event = {0,0,0,0,0};
 	INT32 i = 0;
 	UINT64 joyhats = 0;
 #if 0
diff --git a/src/slope_anchors.c b/src/slope_anchors.c
index ef66ced8f..45791e1bb 100644
--- a/src/slope_anchors.c
+++ b/src/slope_anchors.c
@@ -500,7 +500,7 @@ static void P_SetupAnchoredSlopes (void) {
 
 			if (plane == 0)
 			{
-				CONS_Alert(CONS_WARNING, "Slope anchor linedef %u has no planes set.\n", i);
+				CONS_Alert(CONS_WARNING, "Slope anchor linedef %lu has no planes set.\n", i);
 				continue;
 			}
 
diff --git a/src/st_stuff.c b/src/st_stuff.c
index b5b565be9..08488d7ac 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -366,7 +366,7 @@ static INT32 SCR(INT32 r)
 
 // Devmode information
 
-static void ST_pushDebugString(INT32 *height, const char *string)
+/*static void ST_pushDebugString(INT32 *height, const char *string)
 {
 	V_DrawRightAlignedString(320, *height, V_MONOSPACE, string);
 	*height -= 8;
@@ -418,7 +418,7 @@ static void ST_drawMusicDebug(INT32 *height)
 	}
 
 	ST_pushDebugString(height, va("    Song: %8s", mname));
-}
+}*/
 
 static void ST_drawDebugInfo(void)
 {
@@ -494,8 +494,8 @@ tic_t lt_exitticker = 0, lt_endtime = 0;
 //
 static void ST_cacheLevelTitle(void)
 {
-	UINT8 i;
-	char buf[9];
+	//UINT8 i;
+	//char buf[9];
 
 }
 
@@ -534,7 +534,7 @@ void ST_preDrawTitleCard(void)
 void ST_runTitleCard(void)
 {
 	boolean run = !(paused || P_AutoPause());
-	boolean gp = (marathonmode || (grandprixinfo.gp && grandprixinfo.roundnum));
+	//boolean gp = (marathonmode || (grandprixinfo.gp && grandprixinfo.roundnum));
 
 	if (!G_IsTitleCardAvailable())
 		return;
diff --git a/src/v_video.c b/src/v_video.c
index e8a934708..ae032b7bb 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -866,7 +866,7 @@ void V_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
 	const UINT8 *deststop;
 	UINT32 alphalevel = ((c & V_ALPHAMASK) >> V_ALPHASHIFT);
 	UINT32 blendmode = ((c & V_BLENDMASK) >> V_BLENDSHIFT);
-	INT32 u;
+	//INT32 u;
 
 	if (rendermode == render_none)
 		return;
@@ -2051,7 +2051,7 @@ void V_DrawStringScaled(
 	boolean uppercase;
 	boolean notcolored;
 
-	const UINT8 *colormap;
+	const UINT8 *colormap = NULL;
 	boolean   dance;
 	boolean nodanceoverride;
 	INT32     dancecounter;
diff --git a/src/win32ce/win_sys.c b/src/win32ce/win_sys.c
index 091171b52..95f038dd8 100644
--- a/src/win32ce/win_sys.c
+++ b/src/win32ce/win_sys.c
@@ -303,7 +303,7 @@ static inline BOOL I_ReadyConsole(HANDLE ci)
 
 static inline VOID I_GetConsoleEvents(VOID)
 {
-	event_t ev = {0,0,0,0};
+	event_t ev = {0,0,0,0,0};
 	HANDLE ci = GetStdHandle(STD_INPUT_HANDLE);
 	HANDLE co = GetStdHandle(STD_OUTPUT_HANDLE);
 	CONSOLE_SCREEN_BUFFER_INFO CSBI;