Check bbox for overlap even on bmodels again (disabling it was a speed loss)

[xonotic/darkplaces.git] / winquake.h

diff --git a/winquake.h b/winquake.h
index 3bb1cf7df488550ed2301cbb13f8c17edf2d3ff0..0584ccfb3522ffefffb54028dac1016f96ff214b 100644 (file)
--- a/winquake.h
+++ b/winquake.h
@@ -19,23 +19,23 @@ 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
-
 #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;