mirror of
https://git.code.sf.net/p/quake/quakeforge-old
synced 2025-02-20 18:42:34 +00:00
qw-client and server work again, sound_lib builds, uquake doesn't
This commit is contained in:
parent
9a17811cd3
commit
e023ae7ffe
4 changed files with 27 additions and 38 deletions
|
@ -105,6 +105,7 @@ typedef struct player_info_s
|
|||
} player_info_t;
|
||||
|
||||
|
||||
#ifdef QUAKEWORLD
|
||||
typedef struct
|
||||
{
|
||||
// generated on client side
|
||||
|
@ -120,7 +121,7 @@ typedef struct
|
|||
packet_entities_t packet_entities;
|
||||
qboolean invalid; // if packet_entities delta is invalid
|
||||
} frame_t;
|
||||
|
||||
#endif
|
||||
|
||||
#define CSHIFT_CONTENTS 0
|
||||
#define CSHIFT_DAMAGE 1
|
||||
|
@ -166,11 +167,7 @@ typedef struct
|
|||
byte translations[VID_GRADES*256];
|
||||
} scoreboard_t;
|
||||
|
||||
#ifdef QUAKEWORLD
|
||||
# define MAX_EFRAGS 512
|
||||
#elif UQUAKE
|
||||
# define MAX_EFRAGS 640
|
||||
#endif // FIXME: do we NEED two settings here?
|
||||
#define MAX_EFRAGS 640 // this was 512 in QW, 640 in UQ
|
||||
|
||||
#define MAX_MAPSTRING 2048
|
||||
#define MAX_DEMOS 8
|
||||
|
|
24
common/net.h
24
common/net.h
|
@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
#include <qtypes.h>
|
||||
#include <common.h>
|
||||
#include <cvar.h>
|
||||
#include <render.h>
|
||||
#include <qstructs.h>
|
||||
|
||||
#define PORT_ANY -1
|
||||
|
@ -373,4 +374,27 @@ extern qboolean slistLocal;
|
|||
void NET_Slist_f (void);
|
||||
#endif // UQUAKE
|
||||
|
||||
#define MAX_PACKET_ENTITIES 64 // doesn't count nails
|
||||
typedef struct
|
||||
{
|
||||
int num_entities;
|
||||
entity_state_t entities[MAX_PACKET_ENTITIES];
|
||||
} packet_entities_t;
|
||||
|
||||
typedef struct usercmd_s
|
||||
{
|
||||
byte msec;
|
||||
vec3_t angles;
|
||||
#ifdef UQUAKE
|
||||
float forwardmove, sidemove, upmove;
|
||||
#elif QUAKEWORLD
|
||||
short forwardmove, sidemove, upmove;
|
||||
#endif
|
||||
byte buttons;
|
||||
byte impulse;
|
||||
#ifdef QUAKE2
|
||||
byte lightlevel;
|
||||
#endif
|
||||
} usercmd_t;
|
||||
|
||||
#endif // __NET_H
|
||||
|
|
|
@ -259,20 +259,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
// must be power of two
|
||||
#define UPDATE_MASK (UPDATE_BACKUP-1)
|
||||
|
||||
#define MAX_PACKET_ENTITIES 64 // doesn't count nails
|
||||
typedef struct
|
||||
{
|
||||
int num_entities;
|
||||
entity_state_t entities[MAX_PACKET_ENTITIES];
|
||||
} packet_entities_t;
|
||||
|
||||
typedef struct usercmd_s
|
||||
{
|
||||
byte msec;
|
||||
vec3_t angles;
|
||||
short forwardmove, sidemove, upmove;
|
||||
byte buttons;
|
||||
byte impulse;
|
||||
} usercmd_t;
|
||||
|
||||
#endif // _PROTOCOL_H
|
||||
|
|
|
@ -169,20 +169,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
#define TE_RAILTRAIL 15
|
||||
#endif
|
||||
|
||||
typedef struct usercmd_s
|
||||
{
|
||||
byte msec;
|
||||
vec3_t angles;
|
||||
#ifdef UQUAKE
|
||||
float forwardmove, sidemove, upmove;
|
||||
#elif QUAKEWORLD
|
||||
short forwardmove, sidemove, upmove;
|
||||
#endif
|
||||
byte buttons;
|
||||
byte impulse;
|
||||
#ifdef QUAKE2
|
||||
byte lightlevel;
|
||||
#endif
|
||||
} usercmd_t;
|
||||
|
||||
#endif // __PROTOCOL_H
|
||||
|
|
Loading…
Reference in a new issue