team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

random quick fixes... 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3980 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2012-02-12 05:33:16 +00:00
parent 9ee7301d32
commit 7ca0ccd48c
8 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/client/cl_ents.c
View File

@ -91,10 +91,14 @@ qboolean CL_FilterModelindex(int modelindex, int frame)
void CL_FreeDlights(void)
{
#if defined(GLQUAKE) || defined(D3DQUAKE)
#ifdef RTLIGHTS
int i;
for (i = 0; i < rtlights_max; i++)
if (cl_dlights[i].worldshadowmesh)
SH_FreeShadowMesh(cl_dlights[i].worldshadowmesh);
#endif
#endif
rtlights_max = cl_maxdlights = 0;
BZ_Free(cl_dlights);

1
engine/client/cl_pred.c
View File

@ -764,6 +764,7 @@ static void CL_DecodeStateSize(unsigned short solid, int modelindex, vec3_t mins
}
/*called on packet reception*/
#include "pr_common.h"
void CL_PlayerFrameUpdated(player_state_t *plstate, entity_state_t *state, int sequence)
{
/*update the prediction info*/

2
engine/client/r_surf.c
View File

@ -2095,12 +2095,14 @@ void Surf_DrawWorld (void)
}
else
#endif
#ifdef MAP_DOOM
if (currentmodel->fromgame == fg_doom)
{
vis = NULL;
GLR_DoomWorld();
}
else
#endif
#ifdef TERRAIN
if (currentmodel->type == mod_heightmap)
{

2
engine/common/com_mesh.c
View File

@ -5053,7 +5053,7 @@ qboolean Mod_LoadPSKModel(model_t *mod, void *buffer)
gmdl[i].ofs_st_array = (char*)stcoord - (char*)&gmdl[i];
gmdl[i].numverts = num_vtxw;
#else
for (i = 0; i < num_matt; i++, skin++, gshaders++)
for (i = 0; i < num_matt; i++)
{
#endif

2
engine/common/net_chan.c
View File

@ -688,8 +688,10 @@ int Netchan_Transmit (netchan_t *chan, int length, qbyte *data, int rate)
*(int*)&send.data[(offset - hsz) + 0] = LittleLong(w1);
*(int*)&send.data[(offset - hsz) + 4] = LittleLong(w2);
#ifndef SERVERONLY
if (chan->sock == NS_CLIENT)
*(short*)&send.data[offset - 4] = LittleShort(cls.qport);
#endif
*(short*)&send.data[offset - 2] = LittleShort(((offset-hsz)>>2) | (more?1:0));
NET_SendPacket (chan->sock, (no - offset) + hsz, send.data + offset - hsz, chan->remote_address);

4
engine/common/protocol.h
View File

@ -800,9 +800,9 @@ typedef struct entity_state_s
vec3_t origin;
vec3_t angles;
#if defined(Q2CLIENT) || defined(Q2SERVER)
union
{
#if defined(Q2CLIENT) || defined(Q2SERVER)
struct
{
int renderfx; //q2
@ -812,6 +812,7 @@ typedef struct entity_state_s
qbyte sound; //q2
qbyte event; //q2
} q2;
#endif
struct
{
/*info to predict other players, so I don't get yelled at if fte were to stop supporting it*/
@ -821,7 +822,6 @@ typedef struct entity_state_s
short velocity[3]; // 1/8th
} q1;
} u;
#endif
unsigned short modelindex2; //q2/vweps
unsigned short frame;

2
engine/qclib/initlib.c
View File

@ -658,7 +658,7 @@ string_t PR_AllocTempString (progfuncs_t *progfuncs, char *str)
return (string_t)((unsigned int)i | 0x40000000);
}
string_t PR_AllocTempStringLen (progfuncs_t *progfuncs, char **str, int len)
string_t PR_AllocTempStringLen (progfuncs_t *progfuncs, char **str, unsigned int len)
{
char **ntable;
int newmax;

1
engine/server/sv_user.c
View File

@ -309,6 +309,7 @@ void SV_New_f (void)
split->connection_started = realtime;
#ifdef SVRANKING
split->stats_started = realtime;
#endif
splitnum++;
}
}