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

Clean up entity_state_t diffs.

Browse source
This commit is contained in:
Bill Currie 2012-06-20 08:01:32 +09:00
parent ca1a5dfe8f
commit 8612696816
2 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
include/qw/protocol.h
View file

@ -302,9 +302,8 @@
// entity_state_t is the information conveyed from the server // entity_state_t is the information conveyed from the server
// in an update message // in an update message
typedef struct { typedef struct entity_state_s {
int number; // edict index int number; // edict index
unsigned int flags; // nolerp, etc unsigned int flags; // nolerp, etc
vec3_t origin; vec3_t origin;
@ -312,12 +311,8 @@ typedef struct {
unsigned short modelindex; unsigned short modelindex;
unsigned short frame; unsigned short frame;
int effects; int effects;
byte colormap; byte colormap;
byte skinnum; byte skinnum;
struct skin_s *skin; //FIXME this should not be here, but better state
//change tracking in the client is needed for this
//to be moved
// QSG 2 // QSG 2
byte alpha; byte alpha;
@ -325,6 +320,10 @@ typedef struct {
byte glow_size; byte glow_size;
byte glow_color; byte glow_color;
byte colormod; byte colormod;
struct skin_s *skin; //FIXME this should not be here, but better state
//change tracking in the client is needed for this
//to be moved
} entity_state_t; } entity_state_t;
#define MAX_PACKET_ENTITIES 64 // doesn't count nails #define MAX_PACKET_ENTITIES 64 // doesn't count nails

22
nq/include/protocol.h
View file

@ -223,21 +223,23 @@
#define MAX_CLIENTS 16 #define MAX_CLIENTS 16
// entity_state_t is the information conveyed from the server
// in an update message
typedef struct entity_state_s { typedef struct entity_state_s {
vec3_t origin; vec3_t origin;
vec3_t angles; vec3_t angles;
unsigned short modelindex; unsigned short modelindex;
unsigned short frame; unsigned short frame;
int effects; int effects;
byte colormap; byte colormap;
byte skinnum; byte skinnum;
// QSG 2 // QSG 2
byte alpha; byte alpha;
byte scale; byte scale;
byte glow_size; byte glow_size;
byte glow_color; byte glow_color;
byte colormod; byte colormod;
} entity_state_t; } entity_state_t;
#endif // __protocol_h #endif // __protocol_h