fte/fteqw
2
0
Fork 1
Code Issues Pull requests Releases 1 Activity Actions

minor bugfixes.

Browse source 
changed qw portal collision to match bboxes more closely.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4695 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2014-06-22 23:58:53 +00:00
parent 9ad0d24f54
commit 9ec5f0007b
5 changed files with 36 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

22
engine/server/pr_cmds.c
View file

@ -4357,9 +4357,10 @@ extern sizebuf_t csqcmsgbuffer;
void QCBUILTIN PF_WriteByte (pubprogfuncs_t *prinst, struct globalvars_s *pr_globals)
{
int dest = G_FLOAT(OFS_PARM0);
qbyte val = (qbyte)G_FLOAT(OFS_PARM1);
if (dest == MSG_CSQC)
{ //csqc buffers are always written.
MSG_WriteByte(&csqcmsgbuffer, G_FLOAT(OFS_PARM1));
MSG_WriteByte(&csqcmsgbuffer, val);
return;
}
@ -4373,13 +4374,13 @@ void QCBUILTIN PF_WriteByte (pubprogfuncs_t *prinst, struct globalvars_s *pr_glo
if (progstype == PROG_NQ || progstype == PROG_H2)
{
NPP_NQWriteByte(dest, (qbyte)G_FLOAT(OFS_PARM1));
NPP_NQWriteByte(dest, val);
return;
}
#ifdef NQPROT
else
{
NPP_QWWriteByte(dest, (qbyte)G_FLOAT(OFS_PARM1));
NPP_QWWriteByte(dest, val);
return;
}
#else
@ -4389,19 +4390,20 @@ void QCBUILTIN PF_WriteByte (pubprogfuncs_t *prinst, struct globalvars_s *pr_glo
if (!cl)
return;
ClientReliableCheckBlock(cl, 1);
ClientReliableWrite_Byte(cl, G_FLOAT(OFS_PARM1));
ClientReliableWrite_Byte(cl, val);
}
else
MSG_WriteByte (QWWriteDest(G_FLOAT(OFS_PARM0)), G_FLOAT(OFS_PARM1));
MSG_WriteByte (QWWriteDest(dest), val);
#endif
}
void QCBUILTIN PF_WriteChar (pubprogfuncs_t *prinst, struct globalvars_s *pr_globals)
{
int dest = G_FLOAT(OFS_PARM0);
char val = (char)G_FLOAT(OFS_PARM1);
if (dest == MSG_CSQC)
{ //csqc buffers are always written.
MSG_WriteChar(&csqcmsgbuffer, G_FLOAT(OFS_PARM1));
MSG_WriteChar(&csqcmsgbuffer, val);
return;
}
@ -4414,13 +4416,13 @@ void QCBUILTIN PF_WriteChar (pubprogfuncs_t *prinst, struct globalvars_s *pr_glo
if (progstype == PROG_NQ || progstype == PROG_H2)
{
NPP_NQWriteChar(dest, (char)G_FLOAT(OFS_PARM1));
NPP_NQWriteChar(dest, val);
return;
}
#ifdef NQPROT
else
{
NPP_QWWriteChar(dest, (char)G_FLOAT(OFS_PARM1));
NPP_QWWriteChar(dest, val);
return;
}
#else
@ -4430,10 +4432,10 @@ void QCBUILTIN PF_WriteChar (pubprogfuncs_t *prinst, struct globalvars_s *pr_glo
if (!cl)
return;
ClientReliableCheckBlock(cl, 1);
ClientReliableWrite_Char(cl, G_FLOAT(OFS_PARM1));
ClientReliableWrite_Char(cl, val);
}
else
MSG_WriteChar (QWWriteDest(dest), G_FLOAT(OFS_PARM1));
MSG_WriteChar (QWWriteDest(dest), val);
#endif
}

2
engine/server/sv_main.c
View file

@ -5899,7 +5899,7 @@ void SV_ExecInitialConfigs(char *defaultexec)
if (COM_FileSize("server.cfg") != -1)
Cbuf_InsertText ("exec server.cfg\nexec ftesrv.cfg\n", RESTRICT_LOCAL, false);
else
Cbuf_InsertText ("cl_warncmd 0\nexec quake.rc\nexec ftesrv.cfg\ncl_warncmd 1\n", RESTRICT_LOCAL, false);
Cbuf_InsertText ("cl_warncmd 0\nexec quake.rc\ncl_warncmd 1\nexec ftesrv.cfg\n", RESTRICT_LOCAL, false);
// process command line arguments
Cbuf_Execute ();