DP code cleanup, stage one - all headers that can be protected by ifdef

[xonotic/darkplaces.git] / winquake.h

diff --git a/winquake.h b/winquake.h
index a22bef5bdc1373ec2ffaa4c35179a53714d4ddd2..72e0652ff7a256d4de81e6ebe61008d5bafdcd76 100644 (file)
--- a/winquake.h
+++ b/winquake.h
@@ -19,23 +19,26 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // winquake.h: Win32-specific Quake header file
 
-#pragma warning( disable : 4229 )  // mgraph gets this
+#ifndef WINQUAKE_H
+#define WINQUAKE_H
 
 #include <windows.h>
-#define WM_MOUSEWHEEL                   0x020A
 
 #ifndef SERVERONLY
 #include <ddraw.h>
 #include <dsound.h>
 #endif
 
+#ifndef WM_MOUSEWHEEL
+#define WM_MOUSEWHEEL                   0x020A
+#endif
+
 extern HINSTANCE       global_hInstance;
 extern int                     global_nCmdShow;
 
 #ifndef SERVERONLY
 
 extern LPDIRECTDRAW            lpDD;
-extern qboolean                        DDActive;
 extern LPDIRECTDRAWSURFACE     lpPrimary;
 extern LPDIRECTDRAWSURFACE     lpFrontBuffer;
 extern LPDIRECTDRAWSURFACE     lpBackBuffer;
@@ -44,7 +47,6 @@ extern LPDIRECTSOUND pDS;
 extern LPDIRECTSOUNDBUFFER pDSBuf;
 
 extern DWORD gSndBufSize;
-//#define SNDBUFSIZE 65536
 
 void   VID_LockBuffer (void);
 void   VID_UnlockBuffer (void);
@@ -58,25 +60,18 @@ extern modestate_t  modestate;
 extern HWND                    mainwindow;
 extern qboolean                ActiveApp, Minimized;
 
-extern qboolean        WinNT;
-
 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 cvar_t          _windowed_mouse;
-
-extern int             window_center_x, window_center_y;
+extern int             window_center_x, window_center_y, window_x, window_y;
 extern RECT            window_rect;
 
 extern qboolean        mouseinitialized;
-extern HWND            hwnd_dialog;
 
 extern HANDLE  hinput, houtput;
 
@@ -106,3 +101,6 @@ struct hostent FAR * (PASCAL FAR *pgethostbyaddr)(const char FAR * addr,
                                                                                                  int len, int type);
 int (PASCAL FAR *pgetsockname)(SOCKET s, struct sockaddr FAR *name,
                                                           int FAR * namelen);
+
+#endif
+