Skip to content

Commit

Permalink
src: Whitespace fixes
Browse files Browse the repository at this point in the history
Just removing spaces at the end of line

Signed-off-by: Sylvain Munaut <[email protected]>
  • Loading branch information
smunaut committed Jan 13, 2021
1 parent 768426c commit 67c00f7
Show file tree
Hide file tree
Showing 125 changed files with 4,633 additions and 4,633 deletions.
2 changes: 1 addition & 1 deletion src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
CC= gcc # gcc or g++

CFLAGS=-g -Wall -DNORMALUNIX -DLINUX # -DUSEASM
CFLAGS=-g -Wall -DNORMALUNIX -DLINUX # -DUSEASM
LDFLAGS=-L/usr/X11R6/lib
LIBS=-lXext -lX11 -lnsl -lm

Expand Down
50 changes: 25 additions & 25 deletions src/am_map.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
// $Id:$
Expand Down Expand Up @@ -253,7 +253,7 @@ static fixed_t m_h;

// based on level size
static fixed_t min_x;
static fixed_t min_y;
static fixed_t min_y;
static fixed_t max_x;
static fixed_t max_y;

Expand Down Expand Up @@ -398,20 +398,20 @@ void AM_findMinMaxBoundaries(void)

min_x = min_y = MAXINT;
max_x = max_y = -MAXINT;

for (i=0;i<numvertexes;i++)
{
if (vertexes[i].x < min_x)
min_x = vertexes[i].x;
else if (vertexes[i].x > max_x)
max_x = vertexes[i].x;

if (vertexes[i].y < min_y)
min_y = vertexes[i].y;
else if (vertexes[i].y > max_y)
max_y = vertexes[i].y;
}

max_w = max_x - min_x;
max_h = max_y - min_y;

Expand All @@ -420,7 +420,7 @@ void AM_findMinMaxBoundaries(void)

a = FixedDiv(f_w<<FRACBITS, max_w);
b = FixedDiv(f_h<<FRACBITS, max_h);

min_scale_mtof = a < b ? a : b;
max_scale_mtof = FixedDiv(f_h<<FRACBITS, 2*PLAYERRADIUS);

Expand All @@ -445,7 +445,7 @@ void AM_changeWindowLoc(void)
m_x = max_x - m_w/2;
else if (m_x + m_w/2 < min_x)
m_x = min_x - m_w/2;

if (m_y + m_h/2 > max_y)
m_y = max_y - m_h/2;
else if (m_y + m_h/2 < min_y)
Expand Down Expand Up @@ -483,7 +483,7 @@ void AM_initVariables(void)
for (pnum=0;pnum<MAXPLAYERS;pnum++)
if (playeringame[pnum])
break;

plr = &players[pnum];
m_x = plr->mo->x - m_w/2;
m_y = plr->mo->y - m_h/2;
Expand All @@ -501,13 +501,13 @@ void AM_initVariables(void)
}

//
//
//
//
void AM_loadPics(void)
{
int i;
char namebuf[9];

for (i=0;i<10;i++)
{
sprintf(namebuf, "AMMNUM%d", i);
Expand All @@ -519,7 +519,7 @@ void AM_loadPics(void)
void AM_unloadPics(void)
{
int i;

for (i=0;i<10;i++)
Z_ChangeTag(marknums[i], PU_CACHE);

Expand Down Expand Up @@ -791,7 +791,7 @@ void AM_updateLightLev(void)
//static int litelevels[] = { 0, 3, 5, 6, 6, 7, 7, 7 };
static int litelevels[] = { 0, 4, 7, 10, 12, 14, 15, 15 };
static int litelevelscnt = 0;

// Change light level
if (amclock>nexttic)
{
Expand Down Expand Up @@ -859,24 +859,24 @@ AM_clipMline
BOTTOM =4,
TOP =8
};

register outcode1 = 0;
register outcode2 = 0;
register outside;

fpoint_t tmp;
int dx;
int dy;


#define DOOUTCODE(oc, mx, my) \
(oc) = 0; \
if ((my) < 0) (oc) |= TOP; \
else if ((my) >= f_h) (oc) |= BOTTOM; \
if ((mx) < 0) (oc) |= LEFT; \
else if ((mx) >= f_w) (oc) |= RIGHT;


// do trivial rejects and outcodes
if (ml->a.y > m_y2)
outcode1 = TOP;
Expand All @@ -887,20 +887,20 @@ AM_clipMline
outcode2 = TOP;
else if (ml->b.y < m_y)
outcode2 = BOTTOM;

if (outcode1 & outcode2)
return false; // trivially outside

if (ml->a.x < m_x)
outcode1 |= LEFT;
else if (ml->a.x > m_x2)
outcode1 |= RIGHT;

if (ml->b.x < m_x)
outcode2 |= LEFT;
else if (ml->b.x > m_x2)
outcode2 |= RIGHT;

if (outcode1 & outcode2)
return false; // trivially outside

Expand All @@ -924,7 +924,7 @@ AM_clipMline
outside = outcode1;
else
outside = outcode2;

// clip to each side
if (outside & TOP)
{
Expand Down Expand Up @@ -965,7 +965,7 @@ AM_clipMline
fl->b = tmp;
DOOUTCODE(outcode2, fl->b.x, fl->b.y);
}

if (outcode1 & outcode2)
return false; // trivially outside
}
Expand All @@ -992,7 +992,7 @@ AM_drawFline
register int ax;
register int ay;
register int d;

static fuck = 0;

// For debugging only
Expand Down Expand Up @@ -1184,7 +1184,7 @@ AM_rotate
tmpx =
FixedMul(*x,finecosine[a>>ANGLETOFINESHIFT])
- FixedMul(*y,finesine[a>>ANGLETOFINESHIFT]);

*y =
FixedMul(*x,finesine[a>>ANGLETOFINESHIFT])
+ FixedMul(*y,finecosine[a>>ANGLETOFINESHIFT]);
Expand Down Expand Up @@ -1233,7 +1233,7 @@ AM_drawLineCharacter

if (angle)
AM_rotate(&l.b.x, &l.b.y, angle);

l.b.x += x;
l.b.y += y;

Expand Down Expand Up @@ -1277,7 +1277,7 @@ void AM_drawPlayers(void)
color = 246; // *close* to black
else
color = their_colors[their_color];

AM_drawLineCharacter
(player_arrow, NUMPLYRLINES, 0, p->mo->angle,
color, p->mo->x, p->mo->y);
Expand Down
2 changes: 1 addition & 1 deletion src/am_map.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
// $Id:$
Expand Down
4 changes: 2 additions & 2 deletions src/d_englsh.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
// $Id:$
Expand Down Expand Up @@ -525,7 +525,7 @@
"BLAZE THROUGH THIS ONE!\n"


// after map 06
// after map 06

#define P1TEXT \
"You gloat over the steaming carcass of the\n"\
Expand Down
12 changes: 6 additions & 6 deletions src/d_event.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
// $Id:$
Expand All @@ -17,7 +17,7 @@
//
// DESCRIPTION:
//
//
//
//-----------------------------------------------------------------------------


Expand Down Expand Up @@ -50,7 +50,7 @@ typedef struct
int data3; // mouse/joystick y move
} event_t;


typedef enum
{
ga_nothing,
Expand Down Expand Up @@ -80,7 +80,7 @@ typedef enum
// Flag: game events, not really buttons.
BT_SPECIAL = 128,
BT_SPECIALMASK = 3,

// Flag, weapon change pending.
// If true, the next 3 bits hold weapon num.
BT_CHANGE = 4,
Expand All @@ -94,10 +94,10 @@ typedef enum
BTS_SAVEGAME = 2,

// Savegame slot numbers
// occupy the second byte of buttons.
// occupy the second byte of buttons.
BTS_SAVEMASK = (4+8+16),
BTS_SAVESHIFT = 2,

} buttoncode_t;


Expand Down
8 changes: 4 additions & 4 deletions src/d_french.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
// $Id:$
Expand Down Expand Up @@ -227,8 +227,8 @@
#define HUSTR_PLRRED "ROUGE: "

#define HUSTR_KEYGREEN 'g' // french key should be "V"
#define HUSTR_KEYINDIGO 'i'
#define HUSTR_KEYBROWN 'b'
#define HUSTR_KEYINDIGO 'i'
#define HUSTR_KEYBROWN 'b'
#define HUSTR_KEYRED 'r'

//
Expand Down Expand Up @@ -283,7 +283,7 @@
"POUR VIVRE LA SUITE DE DOOM, JOUEZ\n"\
"A 'AUX PORTES DE L'ENFER' ET A\n"\
"L'EPISODE SUIVANT, 'L'ENFER'!\n"

#define E2TEXT "VOUS AVEZ REUSSI. L'INFAME DEMON\n"\
"QUI CONTROLAIT LA BASE LUNAIRE DE\n"\
"DEIMOS EST MORT, ET VOUS AVEZ\n"\
Expand Down
8 changes: 4 additions & 4 deletions src/d_items.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
// $Id:$
Expand Down Expand Up @@ -56,7 +56,7 @@ weaponinfo_t weaponinfo[NUMWEAPONS] =
S_PUNCH,
S_PUNCH1,
S_NULL
},
},
{
// pistol
am_clip,
Expand All @@ -65,7 +65,7 @@ weaponinfo_t weaponinfo[NUMWEAPONS] =
S_PISTOL,
S_PISTOL1,
S_PISTOLFLASH
},
},
{
// shotgun
am_shell,
Expand Down Expand Up @@ -128,7 +128,7 @@ weaponinfo_t weaponinfo[NUMWEAPONS] =
S_DSGUN,
S_DSGUN1,
S_DSGUNFLASH1
},
},
};


Expand Down
2 changes: 1 addition & 1 deletion src/d_items.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
// $Id:$
Expand Down
Loading

0 comments on commit 67c00f7

Please sign in to comment.