qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-05-30 08:20:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge master into csqc-improvements

Browse source 
That was a mess
This commit is contained in:
Bill Currie 2021-03-25 22:01:31 +09:00
commit c9f1d770e0
1330 changed files with 76887 additions and 82690 deletions
Download patch file Download diff file Expand all files Collapse all files

20
qw/include/client.h
View file

@ -28,6 +28,7 @@
#ifndef _CLIENT_H
#define _CLIENT_H
#include "QF/entity.h"
#include "QF/info.h"
#include "QF/quakefs.h"
#include "QF/vid.h"
@ -37,6 +38,7 @@
#include "client/entities.h"
#include "client/state.h"
#include "client/view.h"
#include "netchan.h"
#include "qw/bothdefs.h"
@ -190,19 +192,12 @@ typedef struct client_state_s {
cshift_t cshifts[NUM_CSHIFTS]; // Color shifts for damage, powerups
cshift_t prev_cshifts[NUM_CSHIFTS]; // and content types
// the client maintains its own idea of view angles, which are sent to the
// server each frame. And reset only at level change and teleport times
vec3_t viewangles;
// the client simulates or interpolates movement to get these values
double time; // this is the time value that the client
// is rendering at. always <= realtime
vec3_t simorg;
vec3_t simvel;
vec3_t simangles;
vec3_t punchangle; // temporary view kick from weapon firing
// the client maintains its own idea of view angles, which are sent to the
// server each frame. And reset only at level change and teleport times
viewstate_t viewstate;
// pitch drifting vars
float idealpitch;
float pitchvel;
@ -211,7 +206,6 @@ typedef struct client_state_s {
double laststop;
qboolean paused; // Sent over by server
int onground; // -1 when in air
float viewheight;
float crouch; // Local amount for smoothing stepups
qboolean inwater;
@ -320,7 +314,9 @@ extern struct cvar_s *cl_fb_players;
extern client_state_t cl;
extern entity_t *cl_static_entities;
typedef struct entitystateset_s DARRAY_TYPE (struct entity_state_s)
entitystateset_t;
extern entitystateset_t cl_static_entities;
extern entity_t cl_entities[512];
extern byte cl_entity_valid[2][512];