From d29586716a767365e1ced9676c9d39a75b61508f Mon Sep 17 00:00:00 2001
From: ZTsukei <ztsukei@gmail.com>
Date: Tue, 9 May 2017 21:21:06 -0400
Subject: [PATCH] v 1.3.13 -------- Added that plus sign Collision no longer
 affects ghosted players

---
 src/doomdef.h | 10 +++++-----
 src/k_kart.c  | 10 ++++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/doomdef.h b/src/doomdef.h
index 97791bbb..38d570a4 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -143,16 +143,16 @@ extern FILE *logstream;
 #define DEVELOP // Disable this for release builds to remove excessive cheat commands and enable MD5 checking and stuff, all in one go. :3
 #ifdef DEVELOP
 #define VERSION    103 // Game version
-#define SUBVERSION 11 // more precise version number
+#define SUBVERSION 13 // more precise version number
 #define VERSIONSTRING "Development EXE"
-#define VERSIONSTRINGW "v1.3.11"
+#define VERSIONSTRINGW "v1.3.13"
 // most interface strings are ignored in development mode.
 // we use comprevision and compbranch instead.
 #else
 #define VERSION    103 // Game version
-#define SUBVERSION 11  // more precise version number
-#define VERSIONSTRING "DevEXE v1.3.11"
-#define VERSIONSTRINGW L"v1.3.11"
+#define SUBVERSION 13  // more precise version number
+#define VERSIONSTRING "DevEXE v1.3.13"
+#define VERSIONSTRINGW L"v1.3.13"
 // Hey! If you change this, add 1 to the MODVERSION below!
 // Otherwise we can't force updates!
 #endif
diff --git a/src/k_kart.c b/src/k_kart.c
index 6bd45933..ea792bbc 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -666,6 +666,7 @@ static INT32 K_KartItemOddsPosition_Retro[MAXPLAYERS][NUMKARTITEMS][MAXPLAYERS]
 // Less ugly 2D arrays
 static INT32 K_KartItemOddsDistance_Retro[NUMKARTITEMS][9] =
 {
+				/*P-Odds	 0  1  2  3  4  5  6  7  8
 				/*Magnet*/ { 0, 1, 2, 0, 0, 0, 0, 0, 0 }, // Magnet
 				   /*Boo*/ { 0, 0, 2, 2, 1, 0, 0, 0, 0 }, // Boo
 			  /*Mushroom*/ {20, 0, 0, 3, 5, 5, 0, 0, 0 }, // Mushroom
@@ -914,7 +915,6 @@ static void K_KartItemRouletteByDistance(player_t *player, ticcmd_t *cmd)
 	INT32 pingame = 0, pexiting = 0;
 	INT32 roulettestop;
 	INT32 prandom;
-	//INT32 ppos = player->kartstuff[k_position] - 1; // TODO: Delete
 	INT32 pdis = 0, useodds = 0;
 	INT32 spawnchance[NUMKARTITEMS * NUMKARTODDS];
 	INT32 chance = 0, numchoices = 0;
@@ -945,7 +945,7 @@ static void K_KartItemRouletteByDistance(player_t *player, ticcmd_t *cmd)
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
 		if (playeringame[i] && !players[i].spectator && players[i].kartstuff[k_position] < player->kartstuff[k_position])
-			pdis = P_AproxDistance(P_AproxDistance( players[i].mo->x - player->mo->x,
+			pdis += P_AproxDistance(P_AproxDistance( players[i].mo->x - player->mo->x,
 													players[i].mo->y - player->mo->y),
 													players[i].mo->z - player->mo->z) / FRACUNIT 
 													* (pingame - players[i].kartstuff[k_position])
@@ -1121,12 +1121,14 @@ void K_KartBouncer(void)
 	for (i = 0; i < MAXPLAYERS; i++)
 		if (playeringame[i] && players[i].mo && !P_MobjWasRemoved(players[i].mo)
 			&& !players[i].kartstuff[k_growshrinktimer] 
-			&& !players[i].kartstuff[k_squishedtimer])
+			&& !players[i].kartstuff[k_squishedtimer]
+			&& !players[i].kartstuff[k_bootaketimer])
 		{
 			for (j = i+1; j < MAXPLAYERS; j++)
 				if (playeringame[j] && players[j].mo && !P_MobjWasRemoved(players[j].mo)
 					&& !players[i].kartstuff[k_squishedtimer]
-					&& !players[j].kartstuff[k_growshrinktimer])
+					&& !players[j].kartstuff[k_growshrinktimer]
+					&& !players[i].kartstuff[k_bootaketimer])
 				{
 					if (players[j].mo == players[i].mo)
 						break;