From 22f42efb61e242a75a017712d6b753149c3a91ce Mon Sep 17 00:00:00 2001
From: CobaltBW <cobaltBW@gmail.com>
Date: Thu, 15 Jul 2021 15:09:02 -0700
Subject: [PATCH] Cleaned up leftover comments

---
 src/b_bot.c  |  4 ----
 src/g_game.c |  2 +-
 src/p_mobj.c |  1 -
 src/p_user.c | 29 ++++++-----------------------
 4 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/src/b_bot.c b/src/b_bot.c
index c61e56f5f..6f4b0ce15 100644
--- a/src/b_bot.c
+++ b/src/b_bot.c
@@ -102,7 +102,6 @@ static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd)
 	if (tails->player->powers[pw_carry] == CR_MACESPIN || tails->player->powers[pw_carry] == CR_GENERIC)
 	{
 		boolean isrelevant = (sonic->player->powers[pw_carry] == CR_MACESPIN || sonic->player->powers[pw_carry] == CR_GENERIC);
-		//dist = P_AproxDistance(tails->x-sonic->x, tails->y-sonic->y); //! This is totally redundant.
 		if (sonic->player->cmd.buttons & BT_JUMP && (sonic->player->pflags & PF_JUMPED) && isrelevant)
 			cmd->buttons |= BT_JUMP;
 		if (isrelevant)
@@ -402,8 +401,6 @@ void B_KeysToTiccmd(mobj_t *mo, ticcmd_t *cmd, boolean forward, boolean backward
 {
 	player_t *player = mo->player;
 	// don't try to do stuff if your sonic is in a minecart or something
-	//if (players[consoleplayer].powers[pw_carry] && players[consoleplayer].powers[pw_carry] != CR_PLAYER)
-	//!!!
 	if (&player->botleader && player->botleader->powers[pw_carry] && player->botleader->powers[pw_carry] != CR_PLAYER)
 		return;
 	// Turn the virtual keypresses into ticcmd_t.
@@ -576,7 +573,6 @@ void B_RespawnBot(INT32 playernum)
 	player->powers[pw_spacetime] = sonic->player->powers[pw_spacetime];
 	player->powers[pw_gravityboots] = sonic->player->powers[pw_gravityboots];
 	player->powers[pw_nocontrol] = sonic->player->powers[pw_nocontrol];
-	//!!! Nuke the speed equivalencies
 	player->pflags |= PF_AUTOBRAKE|(sonic->player->pflags & PF_DIRECTIONCHAR);
 
 	P_TeleportMove(tails, x, y, z);
diff --git a/src/g_game.c b/src/g_game.c
index 4d501f526..8cdeaf079 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -3025,7 +3025,7 @@ void G_DoReborn(INT32 playernum)
 	// Make sure objectplace is OFF when you first start the level!
 	OP_ResetObjectplace();
 
-	//! Tailsbot
+	// Tailsbot
 	if (player->bot == BOT_2PAI || player->bot == BOT_2PHUMAN)
 	{ // Bots respawn next to their master.
 		mobj_t *oldmo = NULL;
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 4924ec053..8af7ab0d0 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -1839,7 +1839,6 @@ void P_XYMovement(mobj_t *mo)
 		// blocked move
 		moved = false;
 
-		//!!!
 		if (player) 
 			B_MoveBlocked(player);
 
diff --git a/src/p_user.c b/src/p_user.c
index dadc23193..b3535623c 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -776,7 +776,7 @@ void P_NightserizePlayer(player_t *player, INT32 nighttime)
 {
 	UINT8 oldmare, oldmarelap, oldmarebonuslap;
 
-	//! Bots can't be NiGHTSerized, silly!1 :P
+	// Bots can't be NiGHTSerized, silly!1 :P
 	if (player->bot == BOT_2PAI || player->bot == BOT_2PHUMAN)
 		return;
 
@@ -1188,7 +1188,7 @@ void P_GivePlayerRings(player_t *player, INT32 num_rings)
 {
 	if (!player)
 		return;
-	//!
+	
 	if ((player->bot == BOT_2PAI || player->bot == BOT_2PHUMAN) && player->botleader)
 		player = player->botleader;
 
@@ -5965,23 +5965,6 @@ static void P_3dMovement(player_t *player)
 		acceleration = 96 + (FixedDiv(player->speed, player->mo->scale)>>FRACBITS) * 40;
 		topspeed = normalspd;
 	}
-	//! Kill this!
-	/* else if (player->bot == BOT_2PAI || player->bot == BOT_2PHUMAN)
-	{ // Bot steals player 1's stats
-		normalspd = FixedMul(players[consoleplayer].normalspeed, player->mo->scale);
-		thrustfactor = players[consoleplayer].thrustfactor;
-		acceleration = players[consoleplayer].accelstart + (FixedDiv(player->speed, player->mo->scale)>>FRACBITS) * players[consoleplayer].acceleration;
-
-		if (player->powers[pw_tailsfly])
-			topspeed = normalspd/2;
-		else if (player->mo->eflags & (MFE_UNDERWATER|MFE_GOOWATER))
-		{
-			topspeed = normalspd/2;
-			acceleration = 2*acceleration/3;
-		}
-		else
-			topspeed = normalspd;
-	} */
 	else
 	{
 		if (player->powers[pw_super] || player->powers[pw_sneakers])
@@ -11488,7 +11471,7 @@ void P_PlayerThink(player_t *player)
 		I_Error("p_playerthink: players[%s].mo == NULL", sizeu1(playeri));
 #endif
 
-	//! Reset terrain blocked status for this frame
+	// Reset terrain blocked status for this frame
 	player->blocked = false;
 
 	// todo: Figure out what is actually causing these problems in the first place...
@@ -11641,7 +11624,7 @@ void P_PlayerThink(player_t *player)
 			INT32 i;
 
 			for (i = 0; i < MAXPLAYERS; i++)
-			{ //!
+			{
 				if (!playeringame[i] || players[i].spectator || players[i].bot == BOT_2PAI || players[i].bot == BOT_2PHUMAN)
 					continue;
 				if (players[i].lives <= 0)
@@ -11673,7 +11656,7 @@ void P_PlayerThink(player_t *player)
 			INT32 i, total = 0, exiting = 0;
 
 			for (i = 0; i < MAXPLAYERS; i++)
-			{ //!
+			{
 				if (!playeringame[i] || players[i].spectator || players[i].bot == BOT_2PAI || players[i].bot == BOT_2PHUMAN)
 					continue;
 				if (players[i].quittime > 30 * TICRATE)
@@ -12614,7 +12597,7 @@ void P_PlayerAfterThink(player_t *player)
 					player->mo->momy = tails->momy;
 					player->mo->momz = tails->momz;
 				}
-				//!
+				
 				if (G_CoopGametype() && tails->player && tails->player->bot != BOT_2PAI)
 				{
 					player->mo->angle = tails->angle;