From f3e158320b52b5f8fa72f62c1d763a7d5a668c02 Mon Sep 17 00:00:00 2001
From: SeventhSentinel <jameshall.yahoosucks@gmail.com>
Date: Thu, 13 Dec 2018 09:34:27 -0500
Subject: [PATCH] Make SPB follow the same rules too

---
 src/k_kart.c  | 6 ++++--
 src/p_enemy.c | 6 +-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index ec9753333..26d741083 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -2539,8 +2539,10 @@ static mobj_t *K_SpawnKartMissile(mobj_t *source, mobjtype_t type, angle_t an, I
 				th->cvmem = SKINCOLOR_KETCHUP;
 			/* FALLTHRU */
 		case MT_JAWZ_DUD:
-			th->movefactor = finalspeed;
 			S_StartSound(th, th->info->activesound);
+			/* FALLTHRU */
+		case MT_SPB:
+			th->movefactor = finalspeed;
 			break;
 		default:
 			break;
@@ -2890,7 +2892,7 @@ static mobj_t *K_ThrowKartItem(player_t *player, boolean missile, mobjtype_t map
 		return NULL;
 
 	// Figure out projectile speed by game speed
-	if (mapthing == MT_ORBINAUT || mapthing == MT_JAWZ || mapthing == MT_JAWZ_DUD) // Trying to keep compatability...
+	if (missile) // Trying to keep compatability...
 	{
 		PROJSPEED = mobjinfo[mapthing].speed;
 		if (gamespeed == 0)
diff --git a/src/p_enemy.c b/src/p_enemy.c
index 5dfb17a63..3fb3aca6c 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -8348,11 +8348,7 @@ void A_SPBChase(mobj_t *actor)
 #endif
 
 	// Default speed
-	wspeed = FixedMul(actor->info->speed, mapheaderinfo[gamemap-1]->mobj_scale);
-	if (gamespeed == 0)
-		wspeed = FixedMul(wspeed, FRACUNIT-FRACUNIT/4);
-	else if (gamespeed == 2)
-		wspeed = FixedMul(wspeed, FRACUNIT+FRACUNIT/4);
+	wspeed = actor->movefactor;
 
 	if (actor->threshold) // Just fired, go straight.
 	{