winquake.h is gone, absorbed into the respective files which used it, also cleaned...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3860 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/snd_dma.c b/snd_dma.c
index 5fa7234f0d5bb7d5194b7f79b735d8eb09daf629..3d5adffe4dffc4acd03c6a2658534f05ddc50ceb 100644 (file)
--- a/snd_dma.c
+++ b/snd_dma.c
@@ -22,7 +22,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "quakedef.h"
 
 #ifdef _WIN32
 #include "quakedef.h"
 
 #ifdef _WIN32

-#include "winquake.h"
+#include <windows.h>
+#include <dsound.h>
+extern DWORD gSndBufSize;
+extern LPDIRECTSOUND pDS;
+extern LPDIRECTSOUNDBUFFER pDSBuf;

 #endif
 
 #include "ogg.h"
 #endif
 
 #include "ogg.h"

diff --git a/snd_win.c b/snd_win.c
index 5434e5dbd29fc180697e71e279c3757fa052623b..835063791b2c3ebe4076c303038ecd828fb76734 100644 (file)
--- a/snd_win.c
+++ b/snd_win.c
@@ -18,7 +18,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 #include "quakedef.h"
 
 */
 #include "quakedef.h"

-#include "winquake.h"
+#include <windows.h>
+#include <dsound.h>
+
+extern HWND mainwindow;

 
 #define iDirectSoundCreate(a,b,c)      pDirectSoundCreate(a,b,c)
 
 
 #define iDirectSoundCreate(a,b,c)      pDirectSoundCreate(a,b,c)
 

diff --git a/sys_win.c b/sys_win.c
index f3ea0e28ccc078cdde8151418aacb57bd10a693e..ad69c1cd206b4f1fbdf5abdf079a7c79a44b0227 100644 (file)
--- a/sys_win.c
+++ b/sys_win.c
@@ -20,12 +20,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // sys_win.c -- Win32 system interface code
 
 #include "quakedef.h"
 // sys_win.c -- Win32 system interface code
 
 #include "quakedef.h"

-#include "winquake.h"
+#include <windows.h>
+#include <dsound.h>

 #include "errno.h"
 #include "resource.h"
 #include "conproc.h"
 #include "direct.h"
 
 #include "errno.h"
 #include "resource.h"
 #include "conproc.h"
 #include "direct.h"
 

+extern void S_BlockSound (void);
+extern void S_UnblockSound (void);
+

 cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"};
 
 // # of seconds to wait on Sys_Error running dedicated before exiting
 cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"};
 
 // # of seconds to wait on Sys_Error running dedicated before exiting


@@ -318,7 +322,6 @@ WinMain
 ==================
 */
 HINSTANCE      global_hInstance;
 ==================
 */
 HINSTANCE      global_hInstance;

-int                    global_nCmdShow;

 const char     *argv[MAX_NUM_ARGVS];
 char           program_name[MAX_OSPATH];
 
 const char     *argv[MAX_NUM_ARGVS];
 char           program_name[MAX_OSPATH];
 


@@ -333,7 +336,6 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
                return 0;
 
        global_hInstance = hInstance;
                return 0;
 
        global_hInstance = hInstance;

-       global_nCmdShow = nCmdShow;

 
        lpBuffer.dwLength = sizeof(MEMORYSTATUS);
        GlobalMemoryStatus (&lpBuffer);
 
        lpBuffer.dwLength = sizeof(MEMORYSTATUS);
        GlobalMemoryStatus (&lpBuffer);

diff --git a/todo b/todo
index d0a3fbcdb9d9815bf4594159e3e9834d7bb791be..a19d4b61ad5ef53eee67f23414e75f8f7d5d7038 100644 (file)
--- a/todo
+++ b/todo
@@ -45,7 +45,8 @@
 d darkplaces: add sv_freenonclients cvar (Vermeulen)
 5 darkplaces: add decals on models (Urre)
 d darkplaces: fix win32 bug where shift key types a character (Black, Sajt)
 d darkplaces: add sv_freenonclients cvar (Vermeulen)
 5 darkplaces: add decals on models (Urre)
 d darkplaces: fix win32 bug where shift key types a character (Black, Sajt)

-2 darkplaces: add KDE/gnome icon somehow using a png version of the darkplaces.ico (de-we)
+0 darkplaces: add de-we to credits page for the great icons (de-we)
+2 darkplaces: add KDE/gnome icons somehow using darkplaces72x72.png (de-we)

 2 darkplaces: add the darkplaces.ico to the executable during compilation, somehow, probably different for msvc and mingw (de-we)
 2 darkplaces: add fs_datapath and fs_userpath cvars to better support Linux, this can be done by making each gamedir add both the basepath and userpath variants of the gamedir, and making sure the userpath one is last so it is used for writing (Mercury)
 3 darkplaces: add fs_reload command to allow restarting the filesystem module, this would mean that it could check for new paks and such (Mercury)
 2 darkplaces: add the darkplaces.ico to the executable during compilation, somehow, probably different for msvc and mingw (de-we)
 2 darkplaces: add fs_datapath and fs_userpath cvars to better support Linux, this can be done by making each gamedir add both the basepath and userpath variants of the gamedir, and making sure the userpath one is last so it is used for writing (Mercury)
 3 darkplaces: add fs_reload command to allow restarting the filesystem module, this would mean that it could check for new paks and such (Mercury)

diff --git a/vid_wgl.c b/vid_wgl.c
index 4b72f7744e43a60359816cbf52e741730ef80b3e..fa20f90f99366b9dde4ed0bedf76fe04f309dbc2 100644 (file)
--- a/vid_wgl.c
+++ b/vid_wgl.c
@@ -20,10 +20,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // gl_vidnt.c -- NT GL vid component
 
 #include "quakedef.h"
 // gl_vidnt.c -- NT GL vid component
 
 #include "quakedef.h"

-#include "winquake.h"
+#include <windows.h>
+#include <dsound.h>

 #include "resource.h"
 #include <commctrl.h>
 
 #include "resource.h"
 #include <commctrl.h>
 

+extern void S_BlockSound (void);
+extern HINSTANCE global_hInstance;
+
+
+#ifndef WM_MOUSEWHEEL
+#define WM_MOUSEWHEEL                   0x020A
+#endif
+

 // Tell startup code that we have a client
 int cl_available = true;
 
 // Tell startup code that we have a client
 int cl_available = true;
 

diff --git a/winquake.h b/winquake.h
deleted file mode 100644 (file)
index 554f1ec..0000000
--- a/winquake.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-
-See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-*/
-// winquake.h: Win32-specific Quake header file
-
-#ifndef WINQUAKE_H
-#define WINQUAKE_H
-
-#include <windows.h>
-
-#include <ddraw.h>
-#include <dsound.h>
-
-#ifndef WM_MOUSEWHEEL
-#define WM_MOUSEWHEEL                   0x020A
-#endif
-
-extern HINSTANCE       global_hInstance;
-extern int                     global_nCmdShow;
-
-extern LPDIRECTDRAW            lpDD;
-extern LPDIRECTDRAWSURFACE     lpPrimary;
-extern LPDIRECTDRAWSURFACE     lpFrontBuffer;
-extern LPDIRECTDRAWSURFACE     lpBackBuffer;
-extern LPDIRECTDRAWPALETTE     lpDDPal;
-extern LPDIRECTSOUND pDS;
-extern LPDIRECTSOUNDBUFFER pDSBuf;
-
-extern DWORD gSndBufSize;
-
-void   VID_LockBuffer (void);
-void   VID_UnlockBuffer (void);
-
-extern HWND                    mainwindow;
-
-extern qboolean        winsock_lib_initialized;
-
-void S_BlockSound (void);
-void S_UnblockSound (void);
-
-int (PASCAL FAR *pWSAStartup)(WORD wVersionRequired, LPWSADATA lpWSAData);
-int (PASCAL FAR *pWSACleanup)(void);
-int (PASCAL FAR *pWSAGetLastError)(void);
-SOCKET (PASCAL FAR *psocket)(int af, int type, int protocol);
-int (PASCAL FAR *pioctlsocket)(SOCKET s, long cmd, u_long FAR *argp);
-int (PASCAL FAR *psetsockopt)(SOCKET s, int level, int optname,
-                                                         const char FAR * optval, int optlen);
-int (PASCAL FAR *precvfrom)(SOCKET s, char FAR * buf, int len, int flags,
-                                                       struct sockaddr FAR *from, int FAR * fromlen);
-int (PASCAL FAR *psendto)(SOCKET s, const char FAR * buf, int len, int flags,
-                                                 const struct sockaddr FAR *to, int tolen);
-int (PASCAL FAR *pclosesocket)(SOCKET s);
-int (PASCAL FAR *pgethostname)(char FAR * name, int namelen);
-struct hostent FAR * (PASCAL FAR *pgethostbyname)(const char FAR * name);
-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
-