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

Header fixups for win32

Browse source
This commit is contained in:
Danne 2000-05-21 11:32:35 +00:00
parent bb43135968
commit c88a6fcccd
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/winquake.h
View file

@ -36,6 +36,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# include <mgraph.h> # include <mgraph.h>
#endif #endif
#include "qtypes.h"
#ifndef WM_MOUSEWHEEL #ifndef WM_MOUSEWHEEL
# define WM_MOUSEWHEEL 0x020A # define WM_MOUSEWHEEL 0x020A

26
source/vid_wgl.c
View file

@ -37,6 +37,10 @@
#include "glquake.h" #include "glquake.h"
#include "in_win.h" #include "in_win.h"
#include <commctrl.h> #include <commctrl.h>
#include "screen.h"
#include "keys.h"
#include "qargs.h"
#include "cmd.h"
#define MAX_MODE_LIST 30 #define MAX_MODE_LIST 30
#define VID_ROW_SIZE 3 #define VID_ROW_SIZE 3
@ -1326,7 +1330,7 @@ void VID_DescribeMode_f (void)
{ {
int t, modenum; int t, modenum;
modenum = Q_atoi (Cmd_Argv(1)); modenum = atoi (Cmd_Argv(1));
t = leavecurrentmode; t = leavecurrentmode;
leavecurrentmode = 0; leavecurrentmode = 0;
@ -1388,7 +1392,7 @@ void VID_InitDIB (HINSTANCE hInstance)
modelist[0].type = MS_WINDOWED; modelist[0].type = MS_WINDOWED;
if (COM_CheckParm("-width")) if (COM_CheckParm("-width"))
modelist[0].width = Q_atoi(com_argv[COM_CheckParm("-width")+1]); modelist[0].width = atoi(com_argv[COM_CheckParm("-width")+1]);
else else
modelist[0].width = 640; modelist[0].width = 640;
@ -1396,7 +1400,7 @@ void VID_InitDIB (HINSTANCE hInstance)
modelist[0].width = 320; modelist[0].width = 320;
if (COM_CheckParm("-height")) if (COM_CheckParm("-height"))
modelist[0].height= Q_atoi(com_argv[COM_CheckParm("-height")+1]); modelist[0].height= atoi(com_argv[COM_CheckParm("-height")+1]);
else else
modelist[0].height = modelist[0].width * 240/320; modelist[0].height = modelist[0].width * 240/320;
@ -1608,7 +1612,7 @@ static void Check_Gamma (unsigned char *pal)
else else
vid_gamma = 0.7; // default to 0.7 on non-3dfx hardware vid_gamma = 0.7; // default to 0.7 on non-3dfx hardware
} else } else
vid_gamma = Q_atof(com_argv[i+1]); vid_gamma = atof(com_argv[i+1]);
for (i=0 ; i<768 ; i++) for (i=0 ; i<768 ; i++)
{ {
@ -1712,7 +1716,7 @@ void VID_Init (unsigned char *palette)
if (COM_CheckParm("-mode")) if (COM_CheckParm("-mode"))
{ {
vid_default = Q_atoi(com_argv[COM_CheckParm("-mode")+1]); vid_default = atoi(com_argv[COM_CheckParm("-mode")+1]);
} }
else else
{ {
@ -1729,7 +1733,7 @@ void VID_Init (unsigned char *palette)
{ {
if (COM_CheckParm("-width")) if (COM_CheckParm("-width"))
{ {
width = Q_atoi(com_argv[COM_CheckParm("-width")+1]); width = atoi(com_argv[COM_CheckParm("-width")+1]);
} }
else else
{ {
@ -1738,7 +1742,7 @@ void VID_Init (unsigned char *palette)
if (COM_CheckParm("-bpp")) if (COM_CheckParm("-bpp"))
{ {
bpp = Q_atoi(com_argv[COM_CheckParm("-bpp")+1]); bpp = atoi(com_argv[COM_CheckParm("-bpp")+1]);
findbpp = 0; findbpp = 0;
} }
else else
@ -1748,7 +1752,7 @@ void VID_Init (unsigned char *palette)
} }
if (COM_CheckParm("-height")) if (COM_CheckParm("-height"))
height = Q_atoi(com_argv[COM_CheckParm("-height")+1]); height = atoi(com_argv[COM_CheckParm("-height")+1]);
// if they want to force it, add the specified mode to the list // if they want to force it, add the specified mode to the list
if (COM_CheckParm("-force") && (nummodes < MAX_MODE_LIST)) if (COM_CheckParm("-force") && (nummodes < MAX_MODE_LIST))
@ -1788,7 +1792,7 @@ void VID_Init (unsigned char *palette)
{ {
if (COM_CheckParm("-height")) if (COM_CheckParm("-height"))
{ {
height = Q_atoi(com_argv[COM_CheckParm("-height")+1]); height = atoi(com_argv[COM_CheckParm("-height")+1]);
for (i=1, vid_default=0 ; i<nummodes ; i++) for (i=1, vid_default=0 ; i<nummodes ; i++)
{ {
@ -1853,7 +1857,7 @@ void VID_Init (unsigned char *palette)
vid_initialized = true; vid_initialized = true;
if ((i = COM_CheckParm("-conwidth")) != 0) if ((i = COM_CheckParm("-conwidth")) != 0)
vid.conwidth = Q_atoi(com_argv[i+1]); vid.conwidth = atoi(com_argv[i+1]);
else else
vid.conwidth = 640; vid.conwidth = 640;
@ -1866,7 +1870,7 @@ void VID_Init (unsigned char *palette)
vid.conheight = vid.conwidth*3 / 4; vid.conheight = vid.conwidth*3 / 4;
if ((i = COM_CheckParm("-conheight")) != 0) if ((i = COM_CheckParm("-conheight")) != 0)
vid.conheight = Q_atoi(com_argv[i+1]); vid.conheight = atoi(com_argv[i+1]);
if (vid.conheight < 200) if (vid.conheight < 200)
vid.conheight = 200; vid.conheight = 200;