nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2024-11-10 22:51:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

minor fixes to get the non-merged version to build properly.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@685 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2004-12-24 09:10:39 +00:00
parent 4b0395e079
commit 5c7b6b809f
6 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/client/cl_main.c
View file

@ -882,7 +882,9 @@ void CL_Disconnect (void)
#endif #endif
SCR_EndLoadingPlaque(); SCR_EndLoadingPlaque();
#ifdef Q2CLIENT
cls.q2server = 0; cls.q2server = 0;
#endif
} }
#undef serverrunning #undef serverrunning

4
engine/client/zqtp.c
View file

@ -2606,7 +2606,11 @@ static void CL_Say (qboolean team, char *extra)
return; return;
} }
#endif #endif
#ifdef Q2CLIENT
MSG_WriteByte (&cls.netchan.message, cls.q2server?clcq2_stringcmd:clc_stringcmd); MSG_WriteByte (&cls.netchan.message, cls.q2server?clcq2_stringcmd:clc_stringcmd);
#else
MSG_WriteByte (&cls.netchan.message, clc_stringcmd);
#endif
SZ_Print (&cls.netchan.message, team ? "say_team " : "say "); SZ_Print (&cls.netchan.message, team ? "say_team " : "say ");
if (sendtext[0] < 32) if (sendtext[0] < 32)

4
engine/common/common.c
View file

@ -883,6 +883,7 @@ static int MSG_ReadRawBits(sizebuf_t *msg, int bits)
return bitmask; return bitmask;
} }
#ifndef MINIMAL
/* /*
============ ============
MSG_ReadHuffBits MSG_ReadHuffBits
@ -907,6 +908,7 @@ static int MSG_ReadHuffBits(sizebuf_t *msg, int bits)
return bitmask; return bitmask;
} }
#endif
int MSG_ReadBits(int bits) int MSG_ReadBits(int bits)
{ {
@ -937,9 +939,11 @@ int MSG_ReadBits(int bits)
case SZ_RAWBITS: case SZ_RAWBITS:
bitmask = MSG_ReadRawBits(&net_message, bits); bitmask = MSG_ReadRawBits(&net_message, bits);
break; break;
#ifndef MINIMAL
case SZ_HUFFMAN: case SZ_HUFFMAN:
bitmask = MSG_ReadHuffBits(&net_message, bits); bitmask = MSG_ReadHuffBits(&net_message, bits);
break; break;
#endif
} }
if (extend) if (extend)

2
engine/common/gl_q2bsp.c
View file

@ -3525,7 +3525,9 @@ void CM_InitBoxHull (void)
box_model.funcs.FatPVS = Q2BSP_FatPVS; box_model.funcs.FatPVS = Q2BSP_FatPVS;
box_model.funcs.EdictInFatPVS = Q2BSP_EdictInFatPVS; box_model.funcs.EdictInFatPVS = Q2BSP_EdictInFatPVS;
box_model.funcs.FindTouchedLeafs_Q1 = Q2BSP_FindTouchedLeafs; box_model.funcs.FindTouchedLeafs_Q1 = Q2BSP_FindTouchedLeafs;
#ifndef SERVERONLY
box_model.funcs.MarkLights = Q2BSP_MarkLights; box_model.funcs.MarkLights = Q2BSP_MarkLights;
#endif
box_model.funcs.LeafPVS = CM_LeafnumPVS; box_model.funcs.LeafPVS = CM_LeafnumPVS;
box_model.funcs.LeafForPoint = CM_ModelPointLeafnum; box_model.funcs.LeafForPoint = CM_ModelPointLeafnum;

9
engine/server/sv_phys.c
View file

@ -331,9 +331,12 @@ int SV_FlyMove (edict_t *ent, float time, trace_t *steptrace)
} }
else else
{ {
VectorSubtract(planes[0], trace.plane.normal, diff); if (numplanes)
if (Length(diff) < 0.01) {
continue; //hit this plane already VectorSubtract(planes[0], trace.plane.normal, diff);
if (Length(diff) < 0.01)
continue; //hit this plane already
}
VectorCopy (trace.plane.normal, planes[numplanes]); VectorCopy (trace.plane.normal, planes[numplanes]);
numplanes++; numplanes++;

2
engine/sw/sw_draw.c
View file

@ -40,7 +40,7 @@ typedef struct {
static rectdesc_t r_rectdesc; static rectdesc_t r_rectdesc;
qbyte *draw_chars; // 8*8 graphic characters qbyte *draw_chars; // 8*8 graphic characters
//mpic_t *draw_disc; mpic_t *draw_disc;
mpic_t *draw_backtile; mpic_t *draw_backtile;
void SWDraw_TransPic (int x, int y, mpic_t *pic); void SWDraw_TransPic (int x, int y, mpic_t *pic);