stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-24 21:31:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup whitespace changes from SRB2_release_2.2.9

Browse source
This commit is contained in:
Alam Ed Arias 2022-11-11 20:38:52 -05:00
parent 6445ef3b70
commit 7e0fa2d34c
7 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extras/conf/SRB2-22.cfg
View file

@ -6884,7 +6884,7 @@ thingtypes
{ {
color = 10; // Green color = 10; // Green
title = "Tutorial"; title = "Tutorial";
799 799
{ {
title = "Tutorial Plant"; title = "Tutorial Plant";

10
src/b_bot.c
View file

@ -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) if (players[i].bot || players[i].playerstate != PST_LIVE || players[i].spectator || !players[i].mo)
continue; continue;
if (!player->botleader) if (!player->botleader)
{ {
player->botleader = &players[i]; // set default 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 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 samepos = (sonic->x == tails->x && sonic->y == tails->y);
boolean blocked = bot->blocked; boolean blocked = bot->blocked;
if (!samepos) if (!samepos)
ang = R_PointToAngle2(tails->x, tails->y, sonic->x, sonic->y); 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; cmd->forwardmove += MAXPLMOVE<<FRACBITS>>16;
if (backward) if (backward)
cmd->forwardmove -= MAXPLMOVE<<FRACBITS>>16; cmd->forwardmove -= MAXPLMOVE<<FRACBITS>>16;
if (left) if (left)
cmd->angleturn += 1280; cmd->angleturn += 1280;
if (right) if (right)
cmd->angleturn -= 1280; cmd->angleturn -= 1280;
if (strafeleft) if (strafeleft)
cmd->sidemove -= MAXPLMOVE<<FRACBITS>>16; cmd->sidemove -= MAXPLMOVE<<FRACBITS>>16;
if (straferight) if (straferight)
@ -486,7 +486,7 @@ boolean B_CheckRespawn(player_t *player)
//We don't have a main player to spawn to! //We don't have a main player to spawn to!
if (!player->botleader) if (!player->botleader)
return false; return false;
sonic = player->botleader->mo; sonic = player->botleader->mo;
// We can't follow Sonic if he's not around! // We can't follow Sonic if he's not around!
if (!sonic || sonic->health <= 0) if (!sonic || sonic->health <= 0)

4
src/d_player.h
View file

@ -344,7 +344,7 @@ typedef struct botmem_s
{ {
boolean lastForward; boolean lastForward;
boolean lastBlocked; boolean lastBlocked;
boolean blocked; boolean blocked;
UINT8 catchup_tics; UINT8 catchup_tics;
UINT8 thinkstate; UINT8 thinkstate;
} botmem_t; } botmem_t;
@ -565,7 +565,7 @@ typedef struct player_s
UINT16 lastbuttons; UINT16 lastbuttons;
botmem_t botmem; botmem_t botmem;
boolean blocked; boolean blocked;
tic_t jointime; // Timer when player joins game to change skin/color tic_t jointime; // Timer when player joins game to change skin/color
tic_t quittime; // Time elapsed since user disconnected, zero if connected tic_t quittime; // Time elapsed since user disconnected, zero if connected
#ifdef HWRENDER #ifdef HWRENDER

4
src/hardware/hw_main.c
View file

@ -16,7 +16,7 @@
#ifdef HWRENDER #ifdef HWRENDER
#include "hw_glob.h" #include "hw_glob.h"
#include "hw_light.h" #include "hw_light.h
#include "hw_drv.h" #include "hw_drv.h"
#include "hw_batching.h" #include "hw_batching.h"
@ -3222,7 +3222,7 @@ static void HWR_Subsector(size_t num)
*rover->topheight, *rover->topheight,
*gl_frontsector->lightlist[light].lightlevel, *gl_frontsector->lightlist[light].lightlevel,
rover->alpha-1 > 255 ? 255 : rover->alpha-1, rover->master->frontsector, 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); false, *gl_frontsector->lightlist[light].extra_colormap);
} }
else else

2
src/p_mobj.c
View file

@ -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 (type == MT_NULL)
{ {
#if 0 #if 0
#ifdef PARANOIA #ifdef PARANOIA
I_Error("Tried to spawn MT_NULL\n"); I_Error("Tried to spawn MT_NULL\n");
#endif #endif

6
src/p_saveg.c
View file

@ -202,7 +202,7 @@ static void P_NetArchivePlayers(void)
WRITEUINT8(save_p, players[i].botmem.catchup_tics); WRITEUINT8(save_p, players[i].botmem.catchup_tics);
WRITEUINT8(save_p, players[i].botmem.thinkstate); WRITEUINT8(save_p, players[i].botmem.thinkstate);
WRITEUINT8(save_p, players[i].removing); WRITEUINT8(save_p, players[i].removing);
WRITEUINT8(save_p, players[i].blocked); WRITEUINT8(save_p, players[i].blocked);
WRITEUINT16(save_p, players[i].lastbuttons); WRITEUINT16(save_p, players[i].lastbuttons);
@ -424,7 +424,7 @@ static void P_NetUnArchivePlayers(void)
// Bots // // Bots //
////////// //////////
players[i].bot = READUINT8(save_p); players[i].bot = READUINT8(save_p);
players[i].botmem.lastForward = READUINT8(save_p); players[i].botmem.lastForward = READUINT8(save_p);
players[i].botmem.lastBlocked = READUINT8(save_p); players[i].botmem.lastBlocked = READUINT8(save_p);
players[i].botmem.catchup_tics = 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].blocked = READUINT8(save_p);
players[i].lastbuttons = READUINT16(save_p); players[i].lastbuttons = READUINT16(save_p);
//////////////////////////// ////////////////////////////
// Conveyor Belt Movement // // Conveyor Belt Movement //
//////////////////////////// ////////////////////////////

2
src/r_skins.c
View file

@ -236,7 +236,7 @@ boolean R_SkinUsable(INT32 playernum, INT32 skinnum)
// Force 2. // Force 2.
return true; return true;
} }
if (metalrecording && skinnum == 5) if (metalrecording && skinnum == 5)
{ {
// Force 3. // Force 3.