...
 
Commits (7)
......@@ -611,7 +611,7 @@ enum
MATERIAL_WOOD,
};
materialtype_t *materialtypes;
extern materialtype_t *materialtypes;
void QFile_ReadMaterialTypes( char* filename );
......
......@@ -37,7 +37,7 @@ float *best;
float *comp;
float *tcomp;
float *bestcomp;
float *frames;
static float *frames;
float *base;
int MatWidth;
......
......@@ -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];
......
......@@ -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
......
......@@ -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;
......
......@@ -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;
......
......@@ -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
......
......@@ -25,14 +25,7 @@
#define MAX_SPRFRAMES MAX_MD2SKINS
dsprite_t sprite;
dsprframe_t frames[MAX_SPRFRAMES];
byte *byteimage, *lbmpalette;
int byteimagewidth, byteimageheight;
qboolean TrueColorImage;
unsigned *longimage;
int longimagewidth, longimageheight;
static dsprframe_t frames[MAX_SPRFRAMES];
char spritename[1024];
......@@ -41,7 +34,6 @@ void FinishSprite( void );
void Cmd_Spritename( void );
char spr_prefix[1024];
char pic_prefix[1024];
extern char *g_outputDir;
......
......@@ -60,6 +60,7 @@ extern float subdivide_size;
// VIS
extern char inbase[32];
extern char outbase[32];
extern qboolean fastvis;
extern qboolean nosort;
extern int testlevel;
......
......@@ -45,8 +45,6 @@ qboolean noopt;
qboolean leaktest;
qboolean verboseentities;
char outbase[32];
int block_xl = -8, block_xh = 7, block_yl = -8, block_yh = 7;
int entity_num;
......
......@@ -44,7 +44,8 @@ vec3_t illumination[MAX_PATCHES]; // light arriving at a patch
vec3_t face_offset[MAX_MAP_FACES]; // for rotating bmodels
dplane_t backplanes[MAX_MAP_PLANES];
char inbase[32], outbase[32];
extern char inbase[32];
extern char outbase[32];
int fakeplanes; // created planes for origin offset
......@@ -64,11 +65,11 @@ float maxlight = 196;
float lightscale = 1.0;
qboolean glview;
extern qboolean glview;
qboolean nopvs;
char source[1024];
extern char source[1024];
float direct_scale = 0.4;
float entity_scale = 1.0;
......@@ -582,7 +583,6 @@ void RadWorld( void ){
RunThreadsOnIndividual( numfaces, true, FinalLightFace );
}
/*
========
main
......@@ -603,6 +603,8 @@ int RAD_Main(){
start = I_FloatTime();
void ( *CalcTextureReflectivity )( void );
if ( !strcmp( game, "heretic2" ) ) {
CalcTextureReflectivity = &CalcTextureReflectivity_Heretic2;
}
......
......@@ -172,7 +172,6 @@ void MakeTnodes( dmodel_t *bm );
void MakePatches( void );
void SubdividePatches( void );
void PairEdges( void );
void ( *CalcTextureReflectivity )( void );
void CalcTextureReflectivity_Quake2( void );
void CalcTextureReflectivity_Heretic2( void );
......
......@@ -40,8 +40,6 @@ qboolean g_skipmodel; // set true when a cd is not g_only
// bogus externs for some TA hacks (common/ using them against q3map)
char *moddir = NULL;
// some old defined that was in cmdlib lost during merge
char writedir[1024];
#if !GDEF_OS_WINDOWS
#define strlwr strlower
......
Subproject commit ed295c5763738b271836b15a051691640d3a1702
Subproject commit 2415b5dcfc820337e45ac7480073e15c84805239