mirror of
https://git.code.sf.net/p/quake/quakeforge-old
synced 2024-11-22 03:41:27 +00:00
QW Server, QW Client, and POQ all compile now..
(Provided you don't run out of disk space well compiling..)
This commit is contained in:
parent
13fbae68ce
commit
7e9e2f177a
7 changed files with 26 additions and 24 deletions
|
@ -33,6 +33,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
#include <setjmp.h>
|
||||
#include <time.h>
|
||||
|
||||
|
||||
#if defined(_WIN32) && !defined(WINDED)
|
||||
void VID_LockBuffer (void);
|
||||
void VID_UnlockBuffer (void);
|
||||
|
@ -47,21 +48,6 @@ void VID_UnlockBuffer (void);
|
|||
#include "sys.h"
|
||||
#include "zone.h"
|
||||
#include "mathlib.h"
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int number; // edict index
|
||||
|
||||
int flags; // nolerp, etc
|
||||
vec3_t origin;
|
||||
vec3_t angles;
|
||||
int modelindex;
|
||||
int frame;
|
||||
int colormap;
|
||||
int skinnum;
|
||||
int effects;
|
||||
} entity_state_t;
|
||||
|
||||
#include "wad.h"
|
||||
#include "draw.h"
|
||||
#include "cvar.h"
|
||||
|
|
|
@ -18,6 +18,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
|
||||
*/
|
||||
|
||||
#ifndef __PMOVE_H
|
||||
#define __PMOVE_H
|
||||
|
||||
typedef struct
|
||||
{
|
||||
vec3_t normal;
|
||||
|
@ -99,3 +102,5 @@ int PM_HullPointContents (hull_t *hull, int num, vec3_t p);
|
|||
int PM_PointContents (vec3_t point);
|
||||
qboolean PM_TestPlayerPosition (vec3_t point);
|
||||
pmtrace_t PM_PlayerMove (vec3_t start, vec3_t stop);
|
||||
|
||||
#endif // __PMOVE_H
|
||||
|
|
|
@ -249,7 +249,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
|
||||
// entity_state_t is the information conveyed from the server
|
||||
// in an update message
|
||||
/*
|
||||
typedef struct
|
||||
{
|
||||
int number; // edict index
|
||||
|
@ -263,7 +262,6 @@ typedef struct
|
|||
int skinnum;
|
||||
int effects;
|
||||
} entity_state_t;
|
||||
*/
|
||||
|
||||
|
||||
#define MAX_PACKET_ENTITIES 64 // doesn't count nails
|
||||
|
|
|
@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
// quakedef.h -- primary header for server
|
||||
|
||||
#define QUAKE_GAME // as opposed to utilities
|
||||
#define VERSION 0.1
|
||||
|
||||
//define PARANOID // speed sapping error checking
|
||||
|
||||
|
|
|
@ -419,7 +419,7 @@ if (bits&(1<<i))
|
|||
if (bits & U_SKIN)
|
||||
skin = MSG_ReadByte();
|
||||
else
|
||||
skin = ent->baseline.skinnum;
|
||||
skin = ent->baseline.skin;
|
||||
if (skin != ent->skinnum) {
|
||||
ent->skinnum = skin;
|
||||
if (num > 0 && num <= cl.maxclients)
|
||||
|
@ -431,7 +431,7 @@ if (bits&(1<<i))
|
|||
if (bits & U_SKIN)
|
||||
ent->skinnum = MSG_ReadByte();
|
||||
else
|
||||
ent->skinnum = ent->baseline.skinnum;
|
||||
ent->skinnum = ent->baseline.skin;
|
||||
#endif
|
||||
|
||||
if (bits & U_EFFECTS)
|
||||
|
@ -495,7 +495,7 @@ void CL_ParseBaseline (entity_t *ent)
|
|||
ent->baseline.modelindex = MSG_ReadByte ();
|
||||
ent->baseline.frame = MSG_ReadByte ();
|
||||
ent->baseline.colormap = MSG_ReadByte();
|
||||
ent->baseline.skinnum = MSG_ReadByte();
|
||||
ent->baseline.skin = MSG_ReadByte();
|
||||
for (i=0 ; i<3 ; i++)
|
||||
{
|
||||
ent->baseline.origin[i] = MSG_ReadCoord ();
|
||||
|
@ -681,7 +681,7 @@ void CL_ParseStatic (void)
|
|||
ent->model = cl.model_precache[ent->baseline.modelindex];
|
||||
ent->frame = ent->baseline.frame;
|
||||
ent->colormap = vid.colormap;
|
||||
ent->skinnum = ent->baseline.skinnum;
|
||||
ent->skinnum = ent->baseline.skin;
|
||||
ent->effects = ent->baseline.effects;
|
||||
|
||||
VectorCopy (ent->baseline.origin, ent->origin);
|
||||
|
|
|
@ -165,3 +165,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
#define TE_IMPLOSION 14
|
||||
#define TE_RAILTRAIL 15
|
||||
#endif
|
||||
|
||||
typedef struct
|
||||
{
|
||||
vec3_t origin;
|
||||
vec3_t angles;
|
||||
int modelindex;
|
||||
int frame;
|
||||
int colormap;
|
||||
int skin;
|
||||
int effects;
|
||||
} entity_state_t;
|
||||
|
||||
|
|
|
@ -493,7 +493,7 @@ void SV_WriteEntitiesToClient (edict_t *clent, sizebuf_t *msg)
|
|||
if (ent->baseline.colormap != ent->v.colormap)
|
||||
bits |= U_COLORMAP;
|
||||
|
||||
if (ent->baseline.skinnum != ent->v.skin)
|
||||
if (ent->baseline.skin != ent->v.skin)
|
||||
bits |= U_SKIN;
|
||||
|
||||
if (ent->baseline.frame != ent->v.frame)
|
||||
|
@ -943,7 +943,7 @@ void SV_CreateBaseline (void)
|
|||
VectorCopy (svent->v.origin, svent->baseline.origin);
|
||||
VectorCopy (svent->v.angles, svent->baseline.angles);
|
||||
svent->baseline.frame = svent->v.frame;
|
||||
svent->baseline.skinnum = svent->v.skin;
|
||||
svent->baseline.skin = svent->v.skin;
|
||||
if (entnum > 0 && entnum <= svs.maxclients)
|
||||
{
|
||||
svent->baseline.colormap = entnum;
|
||||
|
@ -965,7 +965,7 @@ void SV_CreateBaseline (void)
|
|||
MSG_WriteByte (&sv.signon, svent->baseline.modelindex);
|
||||
MSG_WriteByte (&sv.signon, svent->baseline.frame);
|
||||
MSG_WriteByte (&sv.signon, svent->baseline.colormap);
|
||||
MSG_WriteByte (&sv.signon, svent->baseline.skinnum);
|
||||
MSG_WriteByte (&sv.signon, svent->baseline.skin);
|
||||
for (i=0 ; i<3 ; i++)
|
||||
{
|
||||
MSG_WriteCoord(&sv.signon, svent->baseline.origin[i]);
|
||||
|
|
Loading…
Reference in a new issue