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

Remove all "cosmetic" differences between nq and qw sv_phys.c

Browse source
This commit is contained in:
Bill Currie 2010-12-09 08:52:40 +09:00
parent 6e87c4cea6
commit 1291766298
4 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nq/include/server.h
View file

@ -271,6 +271,8 @@ void SV_AddGravity (edict_t *ent);
void SV_Physics_Toss (edict_t *ent);
void SV_Physics_Client (edict_t *ent, int num);
void SV_Physics (void);
void SV_ProgStartFrame (void);
void SV_RunNewmis (void);
qboolean SV_CheckBottom (edict_t *ent);
qboolean SV_movestep (edict_t *ent, const vec3_t move, qboolean relink);

5
nq/source/sv_phys.c
View file

@ -36,6 +36,7 @@ static __attribute__ ((used)) const char rcsid[] =
#include "host.h"
#include "server.h"
#include "sv_progs.h"
#include "world.h"
#define sv_frametime host_frametime
@ -715,7 +716,7 @@ SV_Physics_Step (edict_t *ent)
SV_CheckWaterTransition (ent);
}
static void
void
SV_ProgStartFrame (void)
{
// let the progs know that a new frame has started
@ -759,7 +760,7 @@ SV_RunEntity (edict_t *ent)
}
}
static void
void
SV_RunNewmis (void)
{
edict_t *ent;

4
qw/include/server.h
View file

@ -534,8 +534,10 @@ void SV_AddGravity (struct edict_s *ent);
qboolean SV_RunThink (struct edict_s *ent);
void SV_Physics_Toss (struct edict_s *ent);
void SV_RunNewmis (void);
void SV_Impact (struct edict_s *e1, struct edict_s *e2);
void SV_SetMoveVars(void);
struct trace_s;
int SV_FlyMove (struct edict_s *ent, float time, struct trace_s *steptrace);
struct trace_s SV_PushEntity (struct edict_s *ent, vec3_t push);
//
// sv_send.c

6
qw/source/sv_phys.c
View file

@ -160,7 +160,7 @@ SV_RunThink (edict_t *ent)
Two entities have touched, so run their touch functions
*/
void
static void
SV_Impact (edict_t *e1, edict_t *e2)
{
int old_self, old_other;
@ -223,7 +223,7 @@ ClipVelocity (vec3_t in, vec3_t normal, vec3_t out, float overbounce)
4 = dead stop
If steptrace is not NULL, the trace of any vertical wall hit will be stored
*/
static int
int
SV_FlyMove (edict_t *ent, float time, trace_t *steptrace)
{
float d, time_left;
@ -354,7 +354,7 @@ SV_AddGravity (edict_t *ent)
Does not change the entities velocity at all
*/
static trace_t
trace_t
SV_PushEntity (edict_t *ent, vec3_t push)
{
trace_t trace;