qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2024-11-10 14:42:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

added Ricardo Veguilla's patch (it was sooooo messed up had to hand add it)

Browse source 
i *hope* this works....

Here's the patch for fixing the _windowed_mouse cvar
on SDL binaries. Its now set by default to "0" to
match the default value in vid_x.c and
gl_vidlinuxglx.c.
This commit is contained in:
Nelson Rush 2000-01-09 11:20:55 +00:00
parent 4775ee68af
commit 78f728731c
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
common/vid_sdl.c
View file

@ -25,7 +25,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "quakedef.h"
#include "d_local.h"
cvar_t _windowed_mouse = {"_windowed_mouse","1", true};
cvar_t _windowed_mouse = {"_windowed_mouse","0", true};
static float old_windowed_mouse = 0;
viddef_t vid; // global video state
unsigned short d_8to16table[256];
@ -81,6 +82,8 @@ void VID_Init (unsigned char *palette)
Uint32 flags;
S_Init();
Cvar_RegisterVariable(&_windowed_mouse);
// Load the SDL library
if (SDL_Init(SDL_INIT_VIDEO|SDL_INIT_CDROM)<0) //|SDL_INIT_AUDIO|SDL_INIT_CDROM) < 0)
Sys_Error("VID: Couldn't load SDL: %s", SDL_GetError());
@ -317,8 +320,10 @@ void Sys_SendKeyEvents(void)
break;
case SDL_MOUSEMOTION:
if ( (event.motion.x != (vid.width/2)) ||
(event.motion.y != (vid.height/2)) ) {
if (_windowed_mouse.value)
{
if ((event.motion.x != (vid.width/2)) ||
(event.motion.y != (vid.height/2)) ) {
mouse_x = event.motion.xrel*10;
mouse_y = event.motion.yrel*10;
if ( (event.motion.x < ((vid.width/2)-(vid.width/4))) ||
@ -327,6 +332,7 @@ void Sys_SendKeyEvents(void)
(event.motion.y > ((vid.height/2)+(vid.height/4))) ) {
SDL_WarpMouse(vid.width/2, vid.height/2);
}
}
}
break;
@ -338,11 +344,20 @@ void Sys_SendKeyEvents(void)
break;
}
}
if (old_windowed_mouse != _windowed_mouse.value)
{ old_windowed_mouse = _windowed_mouse.value;
if (_windowed_mouse.value && !COM_CheckParm("-nomouse"))
{ mouse_avail = 1;
}
else
{ mouse_avail = 0;
}
}
}
void IN_Init (void)
{
if ( COM_CheckParm ("-nomouse") )
if ( COM_CheckParm("-nomouse") && !_windowed_mouse.value)
return;
mouse_x = mouse_y = 0.0;
mouse_avail = 1;