mirror of
https://git.code.sf.net/p/quake/newtree
synced 2025-01-22 16:01:25 +00:00
Mostly whitespace, typo fixes. Tweak mouse scaling in sdl more inline with other clients.
This commit is contained in:
parent
4c4e7e9530
commit
57f32284dd
12 changed files with 44 additions and 51 deletions
|
@ -176,7 +176,6 @@ int skipframes;
|
|||
int
|
||||
main (int c, char **v)
|
||||
{
|
||||
|
||||
double time, oldtime, newtime;
|
||||
int j;
|
||||
|
||||
|
@ -217,7 +216,6 @@ main (int c, char **v)
|
|||
Host_Frame (time);
|
||||
oldtime = newtime;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -32,12 +32,11 @@
|
|||
#ifdef HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_STRING_H
|
||||
#include <string.h>
|
||||
# include <string.h>
|
||||
#endif
|
||||
#ifdef HAVE_STRINGS_H
|
||||
#include <strings.h>
|
||||
# include <strings.h>
|
||||
#endif
|
||||
|
||||
#include "console.h"
|
||||
|
|
|
@ -32,12 +32,11 @@
|
|||
#ifdef HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_STRING_H
|
||||
#include <string.h>
|
||||
# include <string.h>
|
||||
#endif
|
||||
#ifdef HAVE_STRINGS_H
|
||||
#include <strings.h>
|
||||
# include <strings.h>
|
||||
#endif
|
||||
|
||||
#include "console.h"
|
||||
|
|
|
@ -32,12 +32,11 @@
|
|||
#ifdef HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_STRING_H
|
||||
#include <string.h>
|
||||
# include <string.h>
|
||||
#endif
|
||||
#ifdef HAVE_STRINGS_H
|
||||
#include <strings.h>
|
||||
# include <strings.h>
|
||||
#endif
|
||||
|
||||
#include "glquake.h"
|
||||
|
|
|
@ -29,13 +29,13 @@
|
|||
#ifdef HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_STRING_H
|
||||
#include <string.h>
|
||||
# include <string.h>
|
||||
#endif
|
||||
#ifdef HAVE_STRINGS_H
|
||||
#include <strings.h>
|
||||
# include <strings.h>
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include "cl_parse.h"
|
||||
|
|
|
@ -296,8 +296,8 @@ IN_SendKeyEvents (void)
|
|||
if ((event.motion.x != (vid.width / 2))
|
||||
|| (event.motion.y != (vid.height / 2))) {
|
||||
// *2 for vid_sdl.c, *10 for vid_sgl.c.
|
||||
mouse_x = event.motion.xrel * 10;
|
||||
mouse_y = event.motion.yrel * 10;
|
||||
mouse_x = event.motion.xrel * 5;
|
||||
mouse_y = event.motion.yrel * 5;
|
||||
if (
|
||||
(event.motion.x <
|
||||
((vid.width / 2) - (vid.width / 4)))
|
||||
|
@ -311,8 +311,8 @@ IN_SendKeyEvents (void)
|
|||
}
|
||||
} else {
|
||||
// following are *2 in vid_sdl.c, vid_sgl.c is *10
|
||||
mouse_x = event.motion.xrel * 10;
|
||||
mouse_y = event.motion.yrel * 10;
|
||||
mouse_x = event.motion.xrel * 5;
|
||||
mouse_y = event.motion.yrel * 5;
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
|
@ -54,15 +54,17 @@ vec3_t forward, right, up;
|
|||
vec3_t player_mins = { -16, -16, -24 };
|
||||
vec3_t player_maxs = { 16, 16, 32 };
|
||||
|
||||
// #define PM_GRAVITY 800
|
||||
// #define PM_STOPSPEED 100
|
||||
// #define PM_MAXSPEED 320
|
||||
// #define PM_SPECTATORMAXSPEED 500
|
||||
// #define PM_ACCELERATE 10
|
||||
// #define PM_AIRACCELERATE 0.7
|
||||
// #define PM_WATERACCELERATE 10
|
||||
// #define PM_FRICTION 6
|
||||
// #define PM_WATERFRICTION 1
|
||||
/* FIXME: Delete this?
|
||||
#define PM_GRAVITY 800
|
||||
#define PM_STOPSPEED 100
|
||||
#define PM_MAXSPEED 320
|
||||
#define PM_SPECTATORMAXSPEED 500
|
||||
#define PM_ACCELERATE 10
|
||||
#define PM_AIRACCELERATE 0.7
|
||||
#define PM_WATERACCELERATE 10
|
||||
#define PM_FRICTION 6
|
||||
#define PM_WATERFRICTION 1
|
||||
*/
|
||||
|
||||
void PM_InitBoxHull (void);
|
||||
void PM_CategorizePosition (void);
|
||||
|
@ -94,7 +96,6 @@ Slide off of the impacting object
|
|||
returns the blocked flags (1 = floor, 2 = step / wall)
|
||||
==================
|
||||
*/
|
||||
#define STOP_EPSILON 0.1
|
||||
|
||||
int
|
||||
PM_ClipVelocity (vec3_t in, vec3_t normal, vec3_t out, float overbounce)
|
||||
|
|
|
@ -29,12 +29,11 @@
|
|||
#ifdef HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_STRING_H
|
||||
#include <string.h>
|
||||
# include <string.h>
|
||||
#endif
|
||||
#ifdef HAVE_STRINGS_H
|
||||
#include <strings.h>
|
||||
# include <strings.h>
|
||||
#endif
|
||||
|
||||
#include "console.h"
|
||||
|
|
|
@ -106,9 +106,7 @@ void
|
|||
SV_CheckVelocity (edict_t *ent)
|
||||
{
|
||||
int i;
|
||||
float wishspeed; // 1999-10-18 SV_MAXVELOCITY fix by
|
||||
|
||||
// Maddes
|
||||
float wishspeed; // 1999-10-18 SV_MAXVELOCITY fix by Maddes
|
||||
|
||||
//
|
||||
// bound velocity
|
||||
|
@ -144,7 +142,7 @@ function will be called, because it is called before any movement is done
|
|||
in a frame. Not used for pushmove objects, because they must be exact.
|
||||
Returns false if the entity removed itself.
|
||||
=============
|
||||
*/
|
||||
*/
|
||||
qboolean
|
||||
SV_RunThink (edict_t *ent)
|
||||
{
|
||||
|
@ -180,7 +178,7 @@ SV_Impact
|
|||
|
||||
Two entities have touched, so run their touch functions
|
||||
==================
|
||||
*/
|
||||
*/
|
||||
void
|
||||
SV_Impact (edict_t *e1, edict_t *e2)
|
||||
{
|
||||
|
@ -214,9 +212,7 @@ ClipVelocity
|
|||
Slide off of the impacting object
|
||||
returns the blocked flags (1 = floor, 2 = step / wall)
|
||||
==================
|
||||
*/
|
||||
#define STOP_EPSILON 0.1
|
||||
|
||||
*/
|
||||
int
|
||||
ClipVelocity (vec3_t in, vec3_t normal, vec3_t out, float overbounce)
|
||||
{
|
||||
|
@ -798,7 +794,7 @@ SV_Physics_Step (edict_t *ent)
|
|||
{
|
||||
qboolean hitsound;
|
||||
|
||||
// frefall if not onground
|
||||
// freefall if not on ground
|
||||
if (!((int) ent->v.flags & (FL_ONGROUND | FL_FLY | FL_SWIM))) {
|
||||
if (ent->v.velocity[2] < movevars.gravity * -0.1)
|
||||
hitsound = true;
|
||||
|
|
|
@ -29,14 +29,14 @@
|
|||
#ifdef HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#include <math.h>
|
||||
#ifdef HAVE_STRING_H
|
||||
#include <string.h>
|
||||
# include <string.h>
|
||||
#endif
|
||||
#ifdef HAVE_STRINGS_H
|
||||
#include <strings.h>
|
||||
# include <strings.h>
|
||||
#endif
|
||||
|
||||
#include <math.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdlib.h>
|
||||
#include <ctype.h>
|
||||
|
@ -1566,10 +1566,11 @@ SV_RunCmd (usercmd_t *ucmd, qboolean inside)
|
|||
pmove_mins[i] = pmove.origin[i] - 256;
|
||||
pmove_maxs[i] = pmove.origin[i] + 256;
|
||||
}
|
||||
#if 1
|
||||
AddLinksToPmove (sv_areanodes);
|
||||
#else
|
||||
|
||||
#if 0
|
||||
AddAllEntsToPmove ();
|
||||
#else
|
||||
AddLinksToPmove (sv_areanodes);
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
|
|
|
@ -31,10 +31,10 @@
|
|||
#endif
|
||||
|
||||
#ifdef HAVE_STRING_H
|
||||
#include <string.h>
|
||||
# include <string.h>
|
||||
#endif
|
||||
#ifdef HAVE_STRINGS_H
|
||||
#include <strings.h>
|
||||
# include <strings.h>
|
||||
#endif
|
||||
|
||||
#include "sys.h"
|
||||
|
|
|
@ -31,11 +31,12 @@
|
|||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#ifdef HAVE_STRING_H
|
||||
#include <string.h>
|
||||
# include <string.h>
|
||||
#endif
|
||||
#ifdef HAVE_STRINGS_H
|
||||
#include <strings.h>
|
||||
# include <strings.h>
|
||||
#endif
|
||||
|
||||
#include "commdef.h"
|
||||
|
|
Loading…
Reference in a new issue