h2data: declare once, define as extern

diff --git a/tools/heretic2/common/qfiles.h b/tools/heretic2/common/qfiles.h
index bee4b4fccf113028f47120168768b4821693790f..7ed4b473c2cf26d19d69e82c31a6827e13e31226 100644 (file)
--- 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 412aefe88062523444e3f071a037e8f8fb0c7c70..0d3ba4ff894534b6426c016dab38abd8c6841b77 100644 (file)
--- 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 ca616bfdbcaaa938843f7679377fdfd45e82e013..ac04d38b506a5f13d80458c16579079f24286879 100644 (file)
--- 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 555303bc4c66861f1e1fe6e84d99a7cdcb8cd4dc..fe1d050a0b21cdf47067dd12aaa820a502809867 100644 (file)
--- 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 e9e91c27c175abeb5c16645b32e5f576aff8a96b..d2960336e684d7e6c9a4c240b6d2d3c2f4e7ea09 100644 (file)
--- 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 0cfa6067098dcc295e0c4af988c68e5ac7466b45..1a9828f455de89031dcded7f8d3ea7a164b696ba 100644 (file)
--- 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 ecb9d0960afc809c4338857216b4a7751a8abdbb..9476e2aae1c06e9a582d70cdf639ceefe18da215 100644 (file)
--- 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];