fix build errors in public master
This commit is contained in:
parent
9571c1e503
commit
38232ce07e
|
@ -1672,7 +1672,7 @@ void S_LoadMusicDefs(UINT16 wadnum)
|
||||||
char *lf;
|
char *lf;
|
||||||
char *stoken;
|
char *stoken;
|
||||||
|
|
||||||
size_t nlf;
|
size_t nlf = 0xFFFFFFFF;
|
||||||
size_t ncr;
|
size_t ncr;
|
||||||
|
|
||||||
musicdef_t *def = NULL;
|
musicdef_t *def = NULL;
|
||||||
|
|
|
@ -76,6 +76,10 @@ int snprintf(char *str, size_t n, const char *fmt, ...);
|
||||||
//int vsnprintf(char *str, size_t n, const char *fmt, va_list ap);
|
//int vsnprintf(char *str, size_t n, const char *fmt, va_list ap);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef _DEBUG
|
||||||
|
#include "console.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef O_BINARY
|
#ifndef O_BINARY
|
||||||
#define O_BINARY 0
|
#define O_BINARY 0
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -3199,7 +3199,7 @@ INT32 I_GetKey(void)
|
||||||
// -----------------
|
// -----------------
|
||||||
#define DI_KEYBOARD_BUFFERSIZE 32 // number of data elements in keyboard buffer
|
#define DI_KEYBOARD_BUFFERSIZE 32 // number of data elements in keyboard buffer
|
||||||
|
|
||||||
void I_StartupKeyboard(void)
|
static void I_StartupKeyboard(void)
|
||||||
{
|
{
|
||||||
DIPROPDWORD dip;
|
DIPROPDWORD dip;
|
||||||
|
|
||||||
|
@ -3435,6 +3435,8 @@ INT32 I_StartupSystem(void)
|
||||||
// some 'more global than globals' things to initialize here ?
|
// some 'more global than globals' things to initialize here ?
|
||||||
graphics_started = keyboard_started = sound_started = cdaudio_started = false;
|
graphics_started = keyboard_started = sound_started = cdaudio_started = false;
|
||||||
|
|
||||||
|
I_StartupKeyboard();
|
||||||
|
|
||||||
#ifdef NDEBUG
|
#ifdef NDEBUG
|
||||||
|
|
||||||
#ifdef BUGTRAP
|
#ifdef BUGTRAP
|
||||||
|
|
|
@ -56,6 +56,7 @@ static consvar_t cv_stretch = {"stretch", "On", CV_SAVE|CV_NOSHOWHELP, CV_OnOff,
|
||||||
static consvar_t cv_ontop = {"ontop", "Never", 0, CV_NeverOnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
static consvar_t cv_ontop = {"ontop", "Never", 0, CV_NeverOnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
boolean highcolor;
|
boolean highcolor;
|
||||||
|
int vid_opengl_state = 0;
|
||||||
|
|
||||||
static BOOL bDIBMode; // means we are using DIB instead of DirectDraw surfaces
|
static BOOL bDIBMode; // means we are using DIB instead of DirectDraw surfaces
|
||||||
static LPBITMAPINFO bmiMain = NULL;
|
static LPBITMAPINFO bmiMain = NULL;
|
||||||
|
@ -949,7 +950,10 @@ INT32 VID_SetMode(INT32 modenum)
|
||||||
}
|
}
|
||||||
|
|
||||||
void VID_CheckRenderer(void) {}
|
void VID_CheckRenderer(void) {}
|
||||||
void VID_CheckGLLoaded(rendermode_t oldrender) {}
|
void VID_CheckGLLoaded(rendermode_t oldrender)
|
||||||
|
{
|
||||||
|
(void)oldrender;
|
||||||
|
}
|
||||||
|
|
||||||
// ========================================================================
|
// ========================================================================
|
||||||
// Free the video buffer of the last video mode,
|
// Free the video buffer of the last video mode,
|
||||||
|
|
Loading…
Reference in New Issue