qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-06-01 17:12:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

More client.h cleanup.

Browse source
This commit is contained in:
Bill Currie 2012-06-26 15:03:04 +09:00
parent 56f68cf119
commit 6e5bc62f78
3 changed files with 34 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/qw/protocol.h
View file

@ -304,7 +304,7 @@
// in an update message // in an update message
typedef struct entity_state_s { typedef struct entity_state_s {
int number; // edict index int number; // edict index
unsigned int flags; // nolerp, etc unsigned flags; // nolerp, etc
vec3_t origin; vec3_t origin;
vec3_t angles; vec3_t angles;

12
nq/include/client.h
View file

@ -42,8 +42,7 @@
#include "protocol.h" #include "protocol.h"
typedef struct usercmd_s typedef struct usercmd_s {
{
vec3_t viewangles; vec3_t viewangles;
// intended velocities // intended velocities
@ -52,8 +51,7 @@ typedef struct usercmd_s
float upmove; float upmove;
} usercmd_t; } usercmd_t;
typedef struct typedef struct {
{
struct info_s *info; struct info_s *info;
struct info_key_s *name; struct info_key_s *name;
float entertime; float entertime;
@ -73,16 +71,14 @@ typedef enum {
so_active, so_active,
} signon_t; } signon_t;
#define MAX_DEMOS 8 #define MAX_DEMOS 8
#define MAX_DEMONAME 16 #define MAX_DEMONAME 16
#define MAX_MAPSTRING 2048
typedef enum { typedef enum {
ca_dedicated, // a dedicated server with no ability to start a client ca_dedicated, // a dedicated server with no ability to start a client
ca_disconnected, // full screen console with no connection ca_disconnected, // full screen console with no connection
ca_connected, // valid netcon, talking to a server ca_connected, // talking to a server
ca_active, // fully connected ca_active, // everything is in, so frames can be rendered
} cactive_t; } cactive_t;
typedef enum { typedef enum {

12
qw/include/client.h
View file

@ -60,8 +60,7 @@ typedef struct player_state_s {
} player_state_t; } player_state_t;
typedef struct player_info_s typedef struct player_info_s {
{
int userid; int userid;
struct info_s *userinfo; struct info_s *userinfo;
@ -85,8 +84,7 @@ typedef struct player_info_s
} player_info_t; } player_info_t;
typedef struct typedef struct {
{
// generated on client side // generated on client side
usercmd_t cmd; // cmd that generated the frame usercmd_t cmd; // cmd that generated the frame
double senttime; // time cmd was sent off double senttime; // time cmd was sent off
@ -101,17 +99,15 @@ typedef struct
qboolean invalid; // true if the packet_entities delta was invalid qboolean invalid; // true if the packet_entities delta was invalid
} frame_t; } frame_t;
#define MAX_DEMOS 8 #define MAX_DEMOS 8
#define MAX_DEMONAME 16 #define MAX_DEMONAME 16
typedef enum { typedef enum {
ca_disconnected, // full screen console with no connection ca_disconnected, // full screen console with no connection
ca_demostart, // starting up a demo ca_demostart, // starting up a demo
ca_connected, // netchan_t established, waiting for svc_serverdata ca_connected, // talking to a server
ca_onserver, // processing data lists, donwloading, etc ca_onserver, // processing data lists, donwloading, etc
ca_active // everything is in, so frames can be rendered ca_active, // everything is in, so frames can be rendered
} cactive_t; } cactive_t;
typedef enum { typedef enum {