From 7e0fa2d34c3449e21b907e78bbcc59f13ceca943 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 11 Nov 2022 20:38:52 -0500
Subject: [PATCH] Cleanup whitespace changes from SRB2_release_2.2.9
---
extras/conf/SRB2-22.cfg | 2 +-
src/b_bot.c | 10 +++++-----
src/d_player.h | 4 ++--
src/hardware/hw_main.c | 4 ++--
src/p_mobj.c | 2 +-
src/p_saveg.c | 6 +++---
src/r_skins.c | 2 +-
7 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/extras/conf/SRB2-22.cfg b/extras/conf/SRB2-22.cfg
index 5580140737..bf1d45f9de 100644
--- a/extras/conf/SRB2-22.cfg
+++ b/extras/conf/SRB2-22.cfg
@@ -6884,7 +6884,7 @@ thingtypes
{
color = 10; // Green
title = "Tutorial";
-
+
799
{
title = "Tutorial Plant";
diff --git a/src/b_bot.c b/src/b_bot.c
index 775a13e294..a12aedcf57 100644
--- a/src/b_bot.c
+++ b/src/b_bot.c
@@ -30,7 +30,7 @@ void B_UpdateBotleader(player_t *player)
{
if (players[i].bot || players[i].playerstate != PST_LIVE || players[i].spectator || !players[i].mo)
continue;
-
+
if (!player->botleader)
{
player->botleader = &players[i]; // set default
@@ -85,7 +85,7 @@ static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd)
boolean stalled = (bmom < scale >> 1) && dist > followthres; // Helps to see if the AI is having trouble catching up
boolean samepos = (sonic->x == tails->x && sonic->y == tails->y);
boolean blocked = bot->blocked;
-
+
if (!samepos)
ang = R_PointToAngle2(tails->x, tails->y, sonic->x, sonic->y);
@@ -448,10 +448,10 @@ void B_KeysToTiccmd(mobj_t *mo, ticcmd_t *cmd, boolean forward, boolean backward
cmd->forwardmove += MAXPLMOVE<<FRACBITS>>16;
if (backward)
cmd->forwardmove -= MAXPLMOVE<<FRACBITS>>16;
- if (left)
+ if (left)
cmd->angleturn += 1280;
if (right)
- cmd->angleturn -= 1280;
+ cmd->angleturn -= 1280;
if (strafeleft)
cmd->sidemove -= MAXPLMOVE<<FRACBITS>>16;
if (straferight)
@@ -486,7 +486,7 @@ boolean B_CheckRespawn(player_t *player)
//We don't have a main player to spawn to!
if (!player->botleader)
return false;
-
+
sonic = player->botleader->mo;
// We can't follow Sonic if he's not around!
if (!sonic || sonic->health <= 0)
diff --git a/src/d_player.h b/src/d_player.h
index 755926480a..c5c637d37a 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -344,7 +344,7 @@ typedef struct botmem_s
{
boolean lastForward;
boolean lastBlocked;
- boolean blocked;
+ boolean blocked;
UINT8 catchup_tics;
UINT8 thinkstate;
} botmem_t;
@@ -565,7 +565,7 @@ typedef struct player_s
UINT16 lastbuttons;
botmem_t botmem;
boolean blocked;
-
+
tic_t jointime; // Timer when player joins game to change skin/color
tic_t quittime; // Time elapsed since user disconnected, zero if connected
#ifdef HWRENDER
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index 92076e6440..2bd7c50714 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -16,7 +16,7 @@
#ifdef HWRENDER
#include "hw_glob.h"
-#include "hw_light.h"
+#include "hw_light.h
#include "hw_drv.h"
#include "hw_batching.h"
@@ -3222,7 +3222,7 @@ static void HWR_Subsector(size_t num)
*rover->topheight,
*gl_frontsector->lightlist[light].lightlevel,
rover->alpha-1 > 255 ? 255 : rover->alpha-1, rover->master->frontsector,
- HWR_RippleBlend(gl_frontsector, rover, false) | (rover->blend ? HWR_GetBlendModeFlag(rover->blend) : PF_Translucent),
+ HWR_RippleBlend(gl_frontsector, rover, false) | (rover->blend ? HWR_GetBlendModeFlag(rover->blend) : PF_Translucent),
false, *gl_frontsector->lightlist[light].extra_colormap);
}
else
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 17be0300a8..fb3edfa433 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -10477,7 +10477,7 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
if (type == MT_NULL)
{
-#if 0
+#if 0
#ifdef PARANOIA
I_Error("Tried to spawn MT_NULL\n");
#endif
diff --git a/src/p_saveg.c b/src/p_saveg.c
index 99ec58bb97..ab7cf23472 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -202,7 +202,7 @@ static void P_NetArchivePlayers(void)
WRITEUINT8(save_p, players[i].botmem.catchup_tics);
WRITEUINT8(save_p, players[i].botmem.thinkstate);
WRITEUINT8(save_p, players[i].removing);
-
+
WRITEUINT8(save_p, players[i].blocked);
WRITEUINT16(save_p, players[i].lastbuttons);
@@ -424,7 +424,7 @@ static void P_NetUnArchivePlayers(void)
// Bots //
//////////
players[i].bot = READUINT8(save_p);
-
+
players[i].botmem.lastForward = READUINT8(save_p);
players[i].botmem.lastBlocked = READUINT8(save_p);
players[i].botmem.catchup_tics = READUINT8(save_p);
@@ -433,7 +433,7 @@ static void P_NetUnArchivePlayers(void)
players[i].blocked = READUINT8(save_p);
players[i].lastbuttons = READUINT16(save_p);
-
+
////////////////////////////
// Conveyor Belt Movement //
////////////////////////////
diff --git a/src/r_skins.c b/src/r_skins.c
index cd53128d22..92fd6cfae2 100644
--- a/src/r_skins.c
+++ b/src/r_skins.c
@@ -236,7 +236,7 @@ boolean R_SkinUsable(INT32 playernum, INT32 skinnum)
// Force 2.
return true;
}
-
+
if (metalrecording && skinnum == 5)
{
// Force 3.
--
GitLab