MSVC C++ build fixes. DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4890 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2015-01-11 04:52:15 +00:00
parent 16b617114c
commit c591711fe8
8 changed files with 17 additions and 12 deletions

View file

@ -330,18 +330,17 @@ void polymer_texinvalidate(void);
void polymer_definehighpalookup(char basepalnum, char palnum, char *fn); void polymer_definehighpalookup(char basepalnum, char palnum, char *fn);
int32_t polymer_havehighpalookup(int32_t basepalnum, int32_t palnum); int32_t polymer_havehighpalookup(int32_t basepalnum, int32_t palnum);
extern _prsprite *prsprites[MAXSPRITES];
static inline void polymer_invalidatesprite(int32_t i) static inline void polymer_invalidatesprite(int32_t i)
{ {
extern _prsprite *prsprites[MAXSPRITES];
if (prsprites[i]) if (prsprites[i])
prsprites[i]->hash = 0xDEADBEEF; prsprites[i]->hash = 0xDEADBEEF;
} }
extern GLuint prartmaps[MAXTILES];
static inline void polymer_invalidateartmap(int32_t tilenum) static inline void polymer_invalidateartmap(int32_t tilenum)
{ {
extern GLuint prartmaps[MAXTILES];
if (prartmaps[tilenum]) if (prartmaps[tilenum])
{ {
bglDeleteTextures(1, &prartmaps[tilenum]); bglDeleteTextures(1, &prartmaps[tilenum]);

View file

@ -83,6 +83,7 @@ static int32_t hvel, vel, svel, angvel;
int32_t g_doHardcodedMovement = 1; int32_t g_doHardcodedMovement = 1;
static int32_t mousexsurp = 0, mouseysurp = 0; static int32_t mousexsurp = 0, mouseysurp = 0;
double msens = 1.0;
int32_t grponlymode = 0; int32_t grponlymode = 0;
int32_t graphicsmode = 0; int32_t graphicsmode = 0;

View file

@ -13,6 +13,7 @@
#endif #endif
#include "compat.h" #include "compat.h"
#include "build.h" #include "build.h"
#include "editor.h"
#include "pragmas.h" #include "pragmas.h"
#include "cache1d.h" #include "cache1d.h"
#include "a.h" #include "a.h"
@ -2397,8 +2398,6 @@ int16_t searchsector, searchwall, searchstat; //search output
// When aiming at a 2-sided wall, 1 if aiming at the bottom part, 0 else // When aiming at a 2-sided wall, 1 if aiming at the bottom part, 0 else
int16_t searchbottomwall, searchisbottom; int16_t searchbottomwall, searchisbottom;
double msens = 1.0;
static char artfilename[20]; static char artfilename[20];
static char mapartfilename[BMAX_PATH]; // map-specific ART file name static char mapartfilename[BMAX_PATH]; // map-specific ART file name
static int32_t mapartfnXXofs; // byte offset to 'XX' (the number part) in the above static int32_t mapartfnXXofs; // byte offset to 'XX' (the number part) in the above

View file

@ -12,7 +12,7 @@
#include "crc32.h" #include "crc32.h"
#include "xxhash.h" #include "xxhash.h"
#include "common.h" #include "common.h"
#include "editor.h"
static symbol_t *symbols = NULL; static symbol_t *symbols = NULL;
static symbol_t *addnewsymbol(const char *name); static symbol_t *addnewsymbol(const char *name);

View file

@ -19,6 +19,7 @@
#include "a.h" #include "a.h"
#include "build.h" #include "build.h"
#include "osd.h" #include "osd.h"
#include "engine_priv.h"
#ifdef USE_OPENGL #ifdef USE_OPENGL
# include "glbuild.h" # include "glbuild.h"

View file

@ -75,6 +75,7 @@
#include "mutex.h" #include "mutex.h"
#include "winbits.h" #include "winbits.h"
#include "engine_priv.h"
// undefine to restrict windowed resolutions to conventional sizes // undefine to restrict windowed resolutions to conventional sizes
#define ANY_WINDOWED_SIZE #define ANY_WINDOWED_SIZE

View file

@ -270,7 +270,6 @@ extern int32_t althud_flashing;
extern int32_t althud_numberpal; extern int32_t althud_numberpal;
extern int32_t althud_numbertile; extern int32_t althud_numbertile;
extern int32_t althud_shadows; extern int32_t althud_shadows;
extern int32_t cacnum;
extern int32_t g_Shareware; extern int32_t g_Shareware;
#if !defined LUNATIC #if !defined LUNATIC
@ -399,10 +398,6 @@ static inline int32_t G_GetTeamPalette(int32_t team)
return pal[team]; return pal[team];
} }
#ifdef USE_OPENGL
extern char forcegl;
#endif
#define minitextshade(x, y, t, s, p, sb) minitext_(x,y,t,s,p,sb) #define minitextshade(x, y, t, s, p, sb) minitext_(x,y,t,s,p,sb)
#define minitext(x, y, t, p, sb) minitext_(x,y,t,0,p,sb) #define minitext(x, y, t, p, sb) minitext_(x,y,t,0,p,sb)
#define menutext(x,y,s,p,t) menutext_(x,y,s,p,(char *)OSD_StripColors(menutextbuf,t),10+16) #define menutext(x,y,s,p,t) menutext_(x,y,s,p,(char *)OSD_StripColors(menutextbuf,t),10+16)

View file

@ -28,6 +28,10 @@ user_defs ud;
const char *s_buildDate = "20120522"; const char *s_buildDate = "20120522";
#ifdef __cplusplus
extern "C" {
#endif
// JBF: g_spriteGravity modified to default to Atomic ed. default when using 1.3d CONs // JBF: g_spriteGravity modified to default to Atomic ed. default when using 1.3d CONs
int32_t g_spriteGravity=176; int32_t g_spriteGravity=176;
@ -92,3 +96,8 @@ int32_t g_lastSaveSlot = -1;
char CheatKeys[2] = { sc_D, sc_N }; char CheatKeys[2] = { sc_D, sc_N };
char setupfilename[BMAX_PATH] = SETUPFILENAME; char setupfilename[BMAX_PATH] = SETUPFILENAME;
#ifdef __cplusplus
}
#endif