A little more...

This commit is contained in:
Joseph Carter 2000-03-24 10:37:23 +00:00
parent 5a06f2f03e
commit 022803757a
10 changed files with 231 additions and 209 deletions

View file

@ -3,14 +3,13 @@
(description)
Copyright (C) 1996-1997 Id Software, Inc.
Copyright (C) 1999,2000 contributors of the QuakeForge project
Please see the file "AUTHORS" for a list of contributors
Author: Jeff Teunissen <deek@quakeforge.net>
Date: 09 Feb 2000
This file is part of the QuakeForge Core system.
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
@ -27,7 +26,9 @@
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA.
Boston, MA 02111-1307, USA
$Id$
*/
#include <stdarg.h>
@ -66,33 +67,19 @@ int fps_count;
int vcrFile = -1;
double host_time;
//cvar_t sys_ticrate = {"sys_ticrate","0.05"};
cvar_t *sys_ticrate;
//cvar_t serverprofile = {"serverprofile", "0"};
cvar_t *serverprofile;
//cvar_t host_framerate = {"host_framerate", "0"}; // set for slow motion
cvar_t *host_framerate;
//cvar_t samelevel = {"samelevel", "0"};
cvar_t *samelevel;
//cvar_t noexit = {"noexit", "0", CVAR_USERINFO|CVAR_SERVERINFO};
cvar_t *noexit;
//cvar_t pausable = {"pausable", "1"};
cvar_t *pausable;
//cvar_t temp1 = {"temp1", "0"};
cvar_t *temp1;
//cvar_t sv_filter = {"sv_filter", "1"}; // strip \n, \r in names?
cvar_t *sv_filter;
//cvar_t teamplay = {"teamplay","0",CVAR_USERINFO|CVAR_SERVERINFO};
cvar_t *teamplay;
//cvar_t deathmatch = {"deathmatch","0"}; // 0, 1, or 2
cvar_t *deathmatch;
//cvar_t coop = {"coop","0"}; // 0 or 1
cvar_t *coop;
//cvar_t fraglimit = {"fraglimit","0",CVAR_USERINFO|CVAR_SERVERINFO};
cvar_t *fraglimit;
//cvar_t skill = {"skill","1"}; // 0 - 3
cvar_t *skill;
//cvar_t timelimit = {"timelimit","0",CVAR_USERINFO|CVAR_SERVERINFO};
cvar_t *timelimit;
#ifdef UQUAKE
@ -730,40 +717,26 @@ Host_InitLocal ( void )
{
Host_InitCommands ();
// Cvar_RegisterVariable (&host_framerate);
host_framerate = Cvar_Get ("host_framerate","0",0,"None");
// Cvar_RegisterVariable (&sys_ticrate);
sys_ticrate = Cvar_Get ("sys_ticrate","0.05",0,"None");
// Cvar_RegisterVariable (&serverprofile);
serverprofile = Cvar_Get ("serverprofile","0",0,"None");
// Cvar_RegisterVariable (&fraglimit);
fraglimit = Cvar_Get ("fraglimit","0",CVAR_USERINFO|CVAR_SERVERINFO,
"None");
// Cvar_RegisterVariable (&timelimit);
timelimit = Cvar_Get ("timelimit","0",CVAR_USERINFO|CVAR_SERVERINFO,
"None");
// Cvar_RegisterVariable (&teamplay);
teamplay = Cvar_Get ("teamplay","0",CVAR_USERINFO|CVAR_SERVERINFO,
"None");
// Cvar_RegisterVariable (&samelevel);
samelevel = Cvar_Get ("samelevel","0",0,"None");
// Cvar_RegisterVariable (&noexit);
noexit = Cvar_Get ("noexit","0",CVAR_USERINFO|CVAR_SERVERINFO,"None");
// Cvar_RegisterVariable (&skill);
skill = Cvar_Get ("skill","1",0,"None");
// Cvar_RegisterVariable (&deathmatch);
deathmatch = Cvar_Get ("deathmatch","0",0,"None");
// Cvar_RegisterVariable (&coop);
coop = Cvar_Get ("coop","0",0,"None");
// Cvar_RegisterVariable (&pausable);
pausable = Cvar_Get ("pausable","1",0,"None");
// Cvar_RegisterVariable (&temp1);
temp1 = Cvar_Get ("temp1","0",0,"None");
// Cvar_RegisterVariable (&sv_filter);
sv_filter = Cvar_Get ("sv_filter","1",0,"None");
Host_FindMaxClients ();

View file

@ -1,5 +1,8 @@
/*
client.h
image.h
(description)
Copyright (C) 1996-1997 Id Software, Inc.
Copyright (C) 1999,2000 contributors of the QuakeForge project
Please see the file "AUTHORS" for a list of contributors
@ -16,9 +19,13 @@ 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.
along with this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
$Id$
*/
#include <zone.h>

View file

@ -1,8 +1,11 @@
/*
Copyright (C) 1996-1997 Id Software, Inc.
Copyright (C) 1999-2000 contributors of the QuakeForge project
Copyright (C) 1999-2000 Nelson Rush.
in_aa.c
(description)
Copyright (C) 1996-1997 Id Software, Inc.
Copyright (C) 2000 Nelson Rush.
Copyright (C) 1999,2000 contributors of the QuakeForge project
Please see the file "AUTHORS" for a list of contributors
This program is free software; you can redistribute it and/or
@ -17,17 +20,22 @@ 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.
along with this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
$Id$
*/
#include "qtypes.h"
#include "quakedef.h"
#include "keys.h"
#include "client.h"
#include "sys.h"
#include "console.h"
#include "cvar.h"
#include <qtypes.h>
#include <quakedef.h>
#include <keys.h>
#include <client.h>
#include <sys.h>
#include <console.h>
#include <cvar.h>
#include <cmd.h>
#include <stdio.h>

View file

@ -1,4 +1,8 @@
/*
in_dos.c
(description)
Copyright (C) 1996-1997 Id Software, Inc.
Copyright (C) 1999,2000 contributors of the QuakeForge project
Please see the file "AUTHORS" for a list of contributors
@ -15,14 +19,17 @@ 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.
along with this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
$Id$
*/
// in_mouse.c -- dos mouse code
#include "quakedef.h"
#include "dosisms.h"
#include <quakedef.h>
#include <dosisms.h>
#define AUX_FLAG_FREELOOK 0x00000001

View file

@ -1,4 +1,8 @@
/*
in_null.c
skeleton input driver code
Copyright (C) 1996-1997 Id Software, Inc.
Copyright (C) 1999,2000 contributors of the QuakeForge project
Please see the file "AUTHORS" for a list of contributors
@ -15,14 +19,17 @@ 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.
along with this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
$Id$
*/
// in_null.c -- for systems without inputs...
#include "quakedef.h"
#include "input.h"
#include <quakedef.h>
#include <input.h>
void

View file

@ -1,4 +1,8 @@
/*
in_sun.c
Sun X11 input handler
Copyright (C) 1996-1997 Id Software, Inc.
Copyright (C) 1999,2000 contributors of the QuakeForge project
Please see the file "AUTHORS" for a list of contributors
@ -15,11 +19,14 @@ 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.
along with this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
$Id$
*/
// in_sun.c -- SUN/X mouse input handler
#include <sys/time.h>
#include <sys/types.h>
@ -37,7 +44,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <X11/Xatom.h>
#include <X11/keysym.h>
#include "quakedef.h"
#include <quakedef.h>
//

View file

@ -1,8 +1,11 @@
/*
Copyright (C) 1996-1997 Id Software, Inc.
Copyright (C) 1999-2000 contributors of the QuakeForge project
Copyright (C) 1999-2000 Marcus Sundberg [mackan@stacken.kth.se]
in_svgalib.c
(description)
Copyright (C) 1996-1997 Id Software, Inc.
Copyright (C) 1999-2000 Marcus Sundberg [mackan@stacken.kth.se]
Copyright (C) 1999,2000 contributors of the QuakeForge project
Please see the file "AUTHORS" for a list of contributors
This program is free software; you can redistribute it and/or
@ -17,17 +20,22 @@ 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.
along with this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
$Id$
*/
#include "qtypes.h"
#include "quakedef.h"
#include "keys.h"
#include "client.h"
#include "sys.h"
#include "console.h"
#include "cvar.h"
#include <qtypes.h>
#include <quakedef.h>
#include <keys.h>
#include <client.h>
#include <sys.h>
#include <console.h>
#include <cvar.h>
#include <cmd.h>
#include <stdio.h>
@ -56,18 +64,8 @@ static int mx, my;
static void IN_init_kb();
static void IN_init_mouse();
//cvar_t _windowed_mouse = {"_windowed_mouse", "1", CVAR_ARCHIVE};
cvar_t *_windowed_mouse;
//cvar_t m_filter = {"m_filter","0"};
cvar_t *m_filter;
/*
static cvar_t mouse_button_commands[3] =
{
{"mouse1","+attack"},
{"mouse2","+strafe"},
{"mouse3","+forward"},
};
*/
static cvar_t *mouse_button_commands[3];
static void keyhandler(int scancode, int state)
@ -243,13 +241,9 @@ static void IN_init_mouse()
char *mousedev;
int mouserate = MOUSE_DEFAULTSAMPLERATE;
// Cvar_RegisterVariable(&mouse_button_commands[0]);
mouse_button_commands[0] = Cvar_Get ("mouse1","+attack",0,"None");
// Cvar_RegisterVariable(&mouse_button_commands[1]);
mouse_button_commands[1] = Cvar_Get ("mouse2","+strafe",0,"None");
// Cvar_RegisterVariable(&mouse_button_commands[2]);
mouse_button_commands[2] = Cvar_Get ("mouse2","+forward",0,"None");
// Cvar_RegisterVariable(&m_filter);
m_filter = Cvar_Get ("m_filter","0",0,"None");
Cmd_AddCommand("force_centerview", Force_CenterView_f);

View file

@ -1,4 +1,8 @@
/*
in_win.c
win32 input code
Copyright (C) 1996-1997 Id Software, Inc.
Copyright (C) 1999,2000 contributors of the QuakeForge project
Please see the file "AUTHORS" for a list of contributors
@ -15,21 +19,25 @@ 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.
along with this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
$Id$
*/
// in_win.c -- windows 95 mouse and joystick code
// 02/21/97 JCB Added extended DirectInput code to support external controllers.
#include "quakedef.h"
#include "winquake.h"
#include <quakedef.h>
#include <winquake.h>
#ifdef HAVE_INITGUID_H
# include <initguid.h>
#endif
#include <dinput.h>
//#include "dosisms.h"
#include "client.h"
//#include <dosisms.h>
#include <client.h>
#include <cmd.h>
#include <console.h>
#include <qargs.h>

View file

@ -1,8 +1,11 @@
/*
in_x11.c - general x11 input driver
in_x11.c
general x11 input driver
Copyright (C) 1996-1997 Id Software, Inc.
Copyright (C) 1999-2000 contributors of the QuakeForge project
Copyright (C) 2000 Marcus Sundberg [mackan@stacken.kth.se]
Copyright (C) 1999,2000 contributors of the QuakeForge project
Please see the file "AUTHORS" for a list of contributors
This program is free software; you can redistribute it and/or
@ -17,9 +20,13 @@ 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.
along with this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
$Id$
*/
#define _BSD
@ -59,13 +66,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <strings.h>
#endif
//cvar_t _windowed_mouse = {"_windowed_mouse","0", CVAR_ARCHIVE};
cvar_t *_windowed_mouse;
//cvar_t m_filter = {"m_filter","0", CVAR_ARCHIVE};
cvar_t *m_filter;
#ifdef HAS_DGA
qboolean dgamouse = 0;
//static cvar_t vid_dga_mouseaccel = {"vid_dga_mouseaccel", "1", CVAR_ARCHIVE};
cvar_t *vid_dga_mouseaccel;
#endif

View file

@ -1,5 +1,8 @@
/*
input.h
(description)
Copyright (C) 1996-1997 Id Software, Inc.
Copyright (C) 1999,2000 contributors of the QuakeForge project
Please see the file "AUTHORS" for a list of contributors
@ -16,9 +19,13 @@ 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.
along with this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
$Id$
*/
#ifndef __INPUT_H__