From: havoc Date: Mon, 2 Feb 2004 14:37:56 +0000 (+0000) Subject: winquake.h is gone, absorbed into the respective files which used it, also cleaned... X-Git-Tag: xonotic-v0.1.0preview~6128 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=2d5a5b20262da4818414dfd9d6987d343ffc4f1c winquake.h is gone, absorbed into the respective files which used it, also cleaned out all unneeded winquake.h cruft 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 5fa7234f..3d5adffe 100644 --- 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 "winquake.h" +#include +#include +extern DWORD gSndBufSize; +extern LPDIRECTSOUND pDS; +extern LPDIRECTSOUNDBUFFER pDSBuf; #endif #include "ogg.h" diff --git a/snd_win.c b/snd_win.c index 5434e5db..83506379 100644 --- 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 "winquake.h" +#include +#include + +extern HWND mainwindow; #define iDirectSoundCreate(a,b,c) pDirectSoundCreate(a,b,c) diff --git a/sys_win.c b/sys_win.c index f3ea0e28..ad69c1cd 100644 --- 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" -#include "winquake.h" +#include +#include #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 @@ -318,7 +322,6 @@ WinMain ================== */ HINSTANCE global_hInstance; -int global_nCmdShow; 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; - global_nCmdShow = nCmdShow; lpBuffer.dwLength = sizeof(MEMORYSTATUS); GlobalMemoryStatus (&lpBuffer); diff --git a/todo b/todo index d0a3fbcd..a19d4b61 100644 --- 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) -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) diff --git a/vid_wgl.c b/vid_wgl.c index 4b72f774..fa20f90f 100644 --- 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" -#include "winquake.h" +#include +#include #include "resource.h" #include +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; diff --git a/winquake.h b/winquake.h deleted file mode 100644 index 554f1ec9..00000000 --- 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 - -#include -#include - -#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 -