shithub: choc

Info  •  Files  •  Log  •  Branches

Merge pull request #1530 from turol/extern-heretic

Clean up extern in Heretic, part N+1

--- a/src/heretic/d_main.c

+++ b/src/heretic/d_main.c

@@ -651,7 +651,6 @@

 void D_BindVariables(void)

 {

-    extern int screenblocks;

     int i;

     M_ApplyPlatformDefaults();

--- a/src/heretic/mn_menu.c

+++ b/src/heretic/mn_menu.c

@@ -120,7 +120,6 @@

 // External Data

 extern int detailLevel;

-extern int screenblocks;

 // Public Data

--- a/src/heretic/r_local.h

+++ b/src/heretic/r_local.h

@@ -294,6 +294,8 @@

 extern int detailshift;         // 0 = high, 1 = low

+extern int screenblocks;

+

 extern void (*colfunc) (void);

 extern void (*basecolfunc) (void);

 extern void (*tlcolfunc) (void);

@@ -341,7 +343,9 @@

 // R_segs.c

 //

 extern int rw_angle1;           // angle to line origin

+extern lighttable_t **walllights;

+

 void R_RenderMaskedSegRange(drawseg_t * ds, int x1, int x2);

@@ -392,6 +396,9 @@

 extern int *texturetranslation; // for global animation

 extern int firstspritelump, lastspritelump, numspritelumps;

+

+extern int columnofs[MAXWIDTH];

+

 byte *R_GetColumn(int tex, int col);

 void R_InitData(void);

--- a/src/heretic/r_main.c

+++ b/src/heretic/r_main.c

@@ -29,7 +29,6 @@

 int validcount = 1;             // increment every time a check is made

 lighttable_t *fixedcolormap;

-extern lighttable_t **walllights;

 int centerx, centery;

 fixed_t centerxfrac, centeryfrac;

--- a/src/heretic/r_plane.c

+++ b/src/heretic/r_plane.c

@@ -382,7 +382,6 @@

     fixed_t frac, fracstep;

     extern byte *ylookup[MAXHEIGHT];

-    extern int columnofs[MAXWIDTH];

 #ifdef RANGECHECK

     if (ds_p - drawsegs > MAXDRAWSEGS)