From 7115276526ac6c6e07e344c1e322884f9ca66017 Mon Sep 17 00:00:00 2001 From: Thomas Debesse Date: Thu, 14 May 2020 13:14:19 +0200 Subject: [PATCH] h2data: declare once, define as extern --- tools/heretic2/common/qfiles.h | 2 +- tools/heretic2/h2data/book.c | 6 ------ tools/heretic2/h2data/fmodels.c | 2 +- tools/heretic2/h2data/images.c | 6 ++++++ tools/heretic2/h2data/pics.c | 7 ------- tools/heretic2/h2data/qdata.h | 4 ++-- tools/heretic2/h2data/sprites.c | 7 ------- 7 files changed, 10 insertions(+), 24 deletions(-) diff --git a/tools/heretic2/common/qfiles.h b/tools/heretic2/common/qfiles.h index bee4b4fc..7ed4b473 100644 --- a/tools/heretic2/common/qfiles.h +++ b/tools/heretic2/common/qfiles.h @@ -611,7 +611,7 @@ enum MATERIAL_WOOD, }; -materialtype_t *materialtypes; +extern materialtype_t *materialtypes; void QFile_ReadMaterialTypes( char* filename ); diff --git a/tools/heretic2/h2data/book.c b/tools/heretic2/h2data/book.c index 412aefe8..0d3ba4ff 100644 --- a/tools/heretic2/h2data/book.c +++ b/tools/heretic2/h2data/book.c @@ -22,12 +22,6 @@ #include "qdata.h" -byte *byteimage, *lbmpalette; -int byteimagewidth, byteimageheight; - -qboolean TrueColorImage; -int longimagewidth, longimageheight; - char book_prefix[1024]; byte buffer[640 * 480]; unsigned long bufferl[640 * 480]; diff --git a/tools/heretic2/h2data/fmodels.c b/tools/heretic2/h2data/fmodels.c index ca616bfd..ac04d38b 100644 --- a/tools/heretic2/h2data/fmodels.c +++ b/tools/heretic2/h2data/fmodels.c @@ -84,7 +84,7 @@ extern fmstvert_t base_st[MAX_FM_VERTS]; extern fmtriangle_t triangles[MAX_FM_TRIANGLES]; // Frames -fmframe_t g_frames[MAX_FM_FRAMES]; +extern fmframe_t g_frames[MAX_FM_FRAMES]; //fmframe_t *g_FMframes; // GL Commands diff --git a/tools/heretic2/h2data/images.c b/tools/heretic2/h2data/images.c index 555303bc..fe1d050a 100644 --- a/tools/heretic2/h2data/images.c +++ b/tools/heretic2/h2data/images.c @@ -35,6 +35,12 @@ extern char *g_outputDir; #endif // _QDATA +byte *byteimage, *lbmpalette; +int byteimagewidth, byteimageheight; +qboolean TrueColorImage; +unsigned *longimage; +int longimagewidth, longimageheight; + char mip_prefix[1024]; // directory to dump the textures in qboolean colormap_issued; diff --git a/tools/heretic2/h2data/pics.c b/tools/heretic2/h2data/pics.c index e9e91c27..d2960336 100644 --- a/tools/heretic2/h2data/pics.c +++ b/tools/heretic2/h2data/pics.c @@ -22,13 +22,6 @@ #include "qdata.h" -byte *byteimage, *lbmpalette; -int byteimagewidth, byteimageheight; - -qboolean TrueColorImage; -unsigned *longimage; -int longimagewidth, longimageheight; - char pic_prefix[1024]; extern char *g_outputDir; diff --git a/tools/heretic2/h2data/qdata.h b/tools/heretic2/h2data/qdata.h index 0cfa6067..1a9828f4 100644 --- a/tools/heretic2/h2data/qdata.h +++ b/tools/heretic2/h2data/qdata.h @@ -135,10 +135,10 @@ void Cmd_Video( void ); void ReleaseFile( char *filename ); -extern byte *byteimage, *lbmpalette; +extern byte *byteimage, *lbmpalette; extern int byteimagewidth, byteimageheight; extern qboolean TrueColorImage; -extern unsigned *longimage; +extern unsigned *longimage; extern int longimagewidth, longimageheight; extern qboolean g_release; // don't grab, copy output data to new tree diff --git a/tools/heretic2/h2data/sprites.c b/tools/heretic2/h2data/sprites.c index ecb9d096..9476e2aa 100644 --- a/tools/heretic2/h2data/sprites.c +++ b/tools/heretic2/h2data/sprites.c @@ -27,13 +27,6 @@ dsprite_t sprite; dsprframe_t frames[MAX_SPRFRAMES]; -byte *byteimage, *lbmpalette; -int byteimagewidth, byteimageheight; - -qboolean TrueColorImage; -unsigned *longimage; -int longimagewidth, longimageheight; - char spritename[1024]; -- 2.39.2