eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

gah, I failed to refresh the file list. dammit

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5060 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2017-02-21 21:18:48 +00:00
parent 5b0843e0c7
commit 88eee17e70
3 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
engine/client/cl_ents.c
View file

@ -865,6 +865,7 @@ void CLFTE_ParseEntities(void)
qboolean isvalid = false; qboolean isvalid = false;
qboolean removeflag; qboolean removeflag;
int inputframe = cls.netchan.incoming_sequence; int inputframe = cls.netchan.incoming_sequence;
int i;
// int i; // int i;
// for (i = cl.validsequence+1; i < cls.netchan.incoming_sequence; i++) // for (i = cl.validsequence+1; i < cls.netchan.incoming_sequence; i++)
@ -880,7 +881,6 @@ void CLFTE_ParseEntities(void)
#ifdef NQPROT #ifdef NQPROT
else if (cls.protocol == CP_NETQUAKE) else if (cls.protocol == CP_NETQUAKE)
{ {
int i;
cls.netchan.incoming_sequence++; cls.netchan.incoming_sequence++;
cl.last_servermessage = realtime; cl.last_servermessage = realtime;
if (cls.fteprotocolextensions2 & PEXT2_PREDINFO) if (cls.fteprotocolextensions2 & PEXT2_PREDINFO)
@ -925,6 +925,16 @@ void CLFTE_ParseEntities(void)
cl.inframes[newpacket].receivedtime = realtime; cl.inframes[newpacket].receivedtime = realtime;
cl.inframes[newpacket].frameid = cls.netchan.incoming_sequence; cl.inframes[newpacket].frameid = cls.netchan.incoming_sequence;
for (i = 0; i < cl.splitclients; i++)
{
cl.inframes[newpacket&UPDATE_MASK].packet_entities.punchangle[i][0] = cl.playerview[i].statsf[STAT_PUNCHANGLE_X];
cl.inframes[newpacket&UPDATE_MASK].packet_entities.punchangle[i][1] = cl.playerview[i].statsf[STAT_PUNCHANGLE_Y];
cl.inframes[newpacket&UPDATE_MASK].packet_entities.punchangle[i][2] = cl.playerview[i].statsf[STAT_PUNCHANGLE_Z];
cl.inframes[newpacket&UPDATE_MASK].packet_entities.punchorigin[i][0] = cl.playerview[i].statsf[STAT_PUNCHVECTOR_X];
cl.inframes[newpacket&UPDATE_MASK].packet_entities.punchorigin[i][1] = cl.playerview[i].statsf[STAT_PUNCHVECTOR_Y];
cl.inframes[newpacket&UPDATE_MASK].packet_entities.punchorigin[i][2] = cl.playerview[i].statsf[STAT_PUNCHVECTOR_Z];
}
if (!cl.validsequence || cls.netchan.incoming_sequence-cl.validsequence >= UPDATE_BACKUP-1 || oldp == newp) if (!cl.validsequence || cls.netchan.incoming_sequence-cl.validsequence >= UPDATE_BACKUP-1 || oldp == newp)
{ {
@ -3614,7 +3624,7 @@ qboolean CL_MayLerp(void)
void CL_TransitionEntities (void) void CL_TransitionEntities (void)
{ {
packet_entities_t *packnew, *packold; packet_entities_t *packnew, *packold;
int newf, newff, oldf; int newf, newff, oldf, i;
qboolean nolerp; qboolean nolerp;
float servertime, frac; float servertime, frac;
@ -3655,6 +3665,12 @@ void CL_TransitionEntities (void)
CL_TransitionPacketEntities(newff, packnew, packold, frac, servertime); CL_TransitionPacketEntities(newff, packnew, packold, frac, servertime);
for (i = 0; i < cl.splitclients; i++)
{
VectorInterpolate(packold->punchangle[i], frac, packnew->punchangle[i], cl.playerview[i].punchangle_sv);
VectorInterpolate(packold->punchorigin[i], frac, packnew->punchorigin[i], cl.playerview[i].punchorigin);
}
/*and transition players too*/ /*and transition players too*/
{ {

8
engine/client/wad.c
View file

@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
void *wadmutex; void *wadmutex;
#ifndef PACKAGE_WAD #ifndef PACKAGE_TEXWAD
void Wads_Flush (void){} void Wads_Flush (void){}
qboolean Wad_NextDownload (void){return true;} qboolean Wad_NextDownload (void){return true;}
void *W_SafeGetLumpName (const char *name, size_t *size) {return NULL;} void *W_SafeGetLumpName (const char *name, size_t *size) {return NULL;}
@ -800,7 +800,7 @@ void Mod_ParseInfoFromEntityLump(model_t *wmodel) //actually, this should be in
char token[4096]; char token[4096];
char key[128]; char key[128];
const char *data = Mod_GetEntitiesString(wmodel); const char *data = Mod_GetEntitiesString(wmodel);
#ifdef PACKAGE_WAD #ifdef PACKAGE_TEXWAD
mapskys_t *msky; mapskys_t *msky;
wads[0] = '\0'; wads[0] = '\0';
@ -837,7 +837,7 @@ void Mod_ParseInfoFromEntityLump(model_t *wmodel) //actually, this should be in
break; // error break; // error
if (!strcmp("wad", key)) // for HalfLife maps if (!strcmp("wad", key)) // for HalfLife maps
{ {
#ifdef PACKAGE_WAD #ifdef PACKAGE_TEXWAD
Q_strncatz(wads, ";", sizeof(wads)); //cache it for later (so that we don't play with any temp memory yet) Q_strncatz(wads, ";", sizeof(wads)); //cache it for later (so that we don't play with any temp memory yet)
Q_strncatz(wads, token, sizeof(wads)); //cache it for later (so that we don't play with any temp memory yet) Q_strncatz(wads, token, sizeof(wads)); //cache it for later (so that we don't play with any temp memory yet)
#endif #endif
@ -919,7 +919,7 @@ void Mod_ParseInfoFromEntityLump(model_t *wmodel) //actually, this should be in
COM_FileBase (wmodel->name, token, sizeof(token)); COM_FileBase (wmodel->name, token, sizeof(token));
#ifdef PACKAGE_WAD #ifdef PACKAGE_TEXWAD
//map-specific sky override feature //map-specific sky override feature
for (msky = mapskies; msky; msky = msky->next) for (msky = mapskies; msky; msky = msky->next)
{ {

4
engine/gl/gl_heightmap.c
View file

@ -5624,7 +5624,11 @@ void Terr_Brush_Draw(heightmap_t *hm, batch_t **batches, entity_t *e)
{ {
if (!bt->shader) if (!bt->shader)
{ {
#ifdef PACKAGE_TEXWAD
miptex_t *tx = W_GetMipTex(bt->shadername); miptex_t *tx = W_GetMipTex(bt->shadername);
#else
const miptex_t *tx = NULL;
#endif
if (!Q_strcasecmp(bt->shadername, "clip")) if (!Q_strcasecmp(bt->shadername, "clip"))
bt->shader = R_RegisterShader(bt->shadername, SUF_LIGHTMAP, "{\nsurfaceparm nodraw\n}"); bt->shader = R_RegisterShader(bt->shadername, SUF_LIGHTMAP, "{\nsurfaceparm nodraw\n}");