qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-23 12:52:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

use HAVE_DDRAW_H and HAVE_DSOUND_H rather than arguing with WildCode over

Browse source 
whether we should include those headers or not ;)
This commit is contained in:
Bill Currie 2001-10-01 21:07:00 +00:00
parent 27d302f9c9
commit 72c16b861b
1 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
include/winquake.h
View file

@ -29,6 +29,10 @@
#ifndef _WINQUAKE_H #ifndef _WINQUAKE_H
#define _WINQUAKE_H #define _WINQUAKE_H
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef _WIN32 #ifdef _WIN32
#ifndef __GNUC__ #ifndef __GNUC__
@ -41,17 +45,22 @@
#define LPCWAVEFORMATEX __hide_LPCWAVEFORMATEX #define LPCWAVEFORMATEX __hide_LPCWAVEFORMATEX
#include <windows.h> #include <windows.h>
#undef LPCWAVEFORMATEX #undef LPCWAVEFORMATEX
#ifdef WINNT #ifdef WINNT
# undef WINNT # undef WINNT
#if 0 # ifdef HAVE_DSOUND_H
# include <dsound.h> # include <dsound.h>
# endif
# ifdef HAVE_DDRAW_H
# include <ddraw.h> # include <ddraw.h>
# endif # endif
# define WINNT # define WINNT
#else #else
# include <windows.h> # include <windows.h>
#if 0 # ifdef HAVE_DSOUND_H
# include <dsound.h> # include <dsound.h>
# endif
# ifdef HAVE_DDRAW_H
# include <ddraw.h> # include <ddraw.h>
# endif # endif
#endif #endif
@ -71,13 +80,15 @@
extern HINSTANCE global_hInstance; extern HINSTANCE global_hInstance;
extern int global_nCmdShow; extern int global_nCmdShow;
#if 0 #ifdef HAVE_DDRAW_H
extern LPDIRECTDRAW lpDD; extern LPDIRECTDRAW lpDD;
extern qboolean DDActive; extern qboolean DDActive;
extern LPDIRECTDRAWSURFACE lpPrimary; extern LPDIRECTDRAWSURFACE lpPrimary;
extern LPDIRECTDRAWSURFACE lpFrontBuffer; extern LPDIRECTDRAWSURFACE lpFrontBuffer;
extern LPDIRECTDRAWSURFACE lpBackBuffer; extern LPDIRECTDRAWSURFACE lpBackBuffer;
extern LPDIRECTDRAWPALETTE lpDDPal; extern LPDIRECTDRAWPALETTE lpDDPal;
#endif
#ifdef HAVE_DSOUND_H
extern LPDIRECTSOUND pDS; extern LPDIRECTSOUND pDS;
extern LPDIRECTSOUNDBUFFER pDSBuf; extern LPDIRECTSOUNDBUFFER pDSBuf;
#endif #endif
@ -96,15 +107,6 @@ extern qboolean WinNT;
int VID_ForceUnlockedAndReturnState (void); int VID_ForceUnlockedAndReturnState (void);
void VID_ForceLockState (int lk); void VID_ForceLockState (int lk);
/*
void IN_ShowMouse (void);
void IN_DeactivateMouse (void);
void IN_HideMouse (void);
void IN_ActivateMouse (void);
void IN_RestoreOriginalMouseState (void);
void IN_SetQuakeMouseState (void);
void IN_MouseEvent (int mstate);
*/
extern qboolean winsock_lib_initialized; extern qboolean winsock_lib_initialized;
extern int window_center_x, window_center_y; extern int window_center_x, window_center_y;