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

------------------------------------------------------------------------

Browse source 
r4189 | acceptthis | 2013-02-05 12:54:29 +0000 (Tue, 05 Feb 2013) | 1 line

clipboard, icon, fullscreen support for glx. Numerous fixes for compile-time warnings.
------------------------------------------------------------------------


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4187 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2013-03-12 22:47:42 +00:00
parent 5c108ea81f
commit 0ecf71adaf
57 changed files with 815 additions and 370 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engine/server/pr_cmds.c
View file

@ -7351,7 +7351,7 @@ static void QCBUILTIN PF_h2starteffect(pubprogfuncs_t *prinst, struct globalvars
static void QCBUILTIN PF_h2endeffect(pubprogfuncs_t *prinst, struct globalvars_s *pr_globals)
{
int ign = G_FLOAT(OFS_PARM0);
// int ign = G_FLOAT(OFS_PARM0);
int index = G_FLOAT(OFS_PARM1);
Con_DPrintf("Stop effect %i\n", index);
@ -10556,7 +10556,7 @@ void PR_DumpPlatform_f(void)
{"SLIST_TEST_NOTEQUAL", "const float", MENU, SLIST_TEST_NOTEQUAL},
{"SLIST_TEST_STARTSWITH", "const float", MENU, SLIST_TEST_STARTSWITH},
{"SLIST_TEST_NOTSTARTSWITH", "const float", MENU, SLIST_TEST_NOTSTARTSWITH},
NULL
{NULL}
};
targ = 0;

6
engine/server/server.h
View file

@ -529,10 +529,10 @@ typedef struct client_s
qboolean csqcactive;
#ifdef PROTOCOL_VERSION_FTE
qboolean pextknown;
unsigned long fteprotocolextensions;
unsigned long fteprotocolextensions2;
unsigned int fteprotocolextensions;
unsigned int fteprotocolextensions2;
#endif
unsigned long zquake_extensions;
unsigned int zquake_extensions;
unsigned int max_net_ents; /*highest entity number the client can receive (limited by either protocol or client's buffer size)*/
unsigned int maxmodels; /*max models supported by whatever the protocol is*/

9
engine/server/sv_ents.c
View file

@ -109,7 +109,9 @@ int numnails;
int nailcount = 0;
extern int sv_nailmodel, sv_supernailmodel, sv_playermodel;
#ifdef SERVER_DEMO_PLAYBACK
qboolean demonails;
#endif
static edict_t *csqcent[MAX_EDICTS];
static int csqcnuments;
@ -122,7 +124,9 @@ qboolean SV_AddNailUpdate (edict_t *ent)
if (sv_nailhack.value)
return false;
#ifdef SERVER_DEMO_PLAYBACK
demonails = false;
#endif
if (numnails == MAX_NAILS)
return true;
@ -131,7 +135,7 @@ qboolean SV_AddNailUpdate (edict_t *ent)
numnails++;
return true;
}
#ifdef SERVER_DEMO_PLAYBACK
qboolean SV_DemoNailUpdate (int i)
{
demonails = true;
@ -142,6 +146,7 @@ qboolean SV_DemoNailUpdate (int i)
numnails++;
return true;
}
#endif
void SV_EmitNailUpdate (sizebuf_t *msg, qboolean recorder)
{
@ -2891,7 +2896,7 @@ void SV_Snapshot_BuildStateQ1(entity_state_t *state, edict_t *ent, client_t *cli
state->lightpflags = ent->xv->pflags;
state->u.q1.traileffectnum = ent->xv->traileffectnum;
if (!ent->xv->gravitydir[0] && !ent->xv->gravitydir[1] && !ent->xv->gravitydir[2] || (ent->xv->gravitydir[2] == -1))
if ((!ent->xv->gravitydir[0] && !ent->xv->gravitydir[1] && !ent->xv->gravitydir[2]) || (ent->xv->gravitydir[2] == -1))
{
state->u.q1.gravitydir[0] = 0;
state->u.q1.gravitydir[1] = 0;

4
engine/server/sv_main.c
View file

@ -2595,8 +2595,8 @@ client_t *SVC_DirectConnect(void)
if (ISNQCLIENT(newcl))
{
//FIXME: we should delay this until we actually have a name.
SV_BroadcastPrintf(PRINT_LOW, "New client connected\n", newcl->name);
//FIXME: we should delay this until we actually have a name, because right now they'll be called unnamed or unconnected or something
SV_BroadcastPrintf(PRINT_LOW, "New client connected\n");
}
else if (redirect)
{

8
engine/server/sv_mvd.c
View file

@ -30,12 +30,6 @@ void SV_MVDStop_f (void);
#define demo_size_padding 0x1000
//#define MIN_MVD_MEMORY 0x100000
//#define MAXSIZE (demobuffer->end < demobuffer->last ? \
// demobuffer->start - demobuffer->end : \
// demobuffer->maxsize - demobuffer->end)
static void SV_DemoDir_Callback(struct cvar_s *var, char *oldvalue);
cvar_t sv_demoUseCache = CVARD("sv_demoUseCache", "0", "If set, demo data will be flushed only periodically");
@ -2245,7 +2239,7 @@ void SV_MVDEasyRecord_f (void)
{
char *c;
Q_strncpyz (name, Cmd_Argv(1), sizeof(name));
while(c = strchr(name, ':'))
while((c = strchr(name, ':')))
*c = '-';
}
else

3
engine/server/sv_user.c
View file

@ -425,7 +425,6 @@ void SVNQ_New_f (void)
int i;
int maxplayers = 0;
int op;
extern cvar_t pr_maxedicts;
unsigned int protext1 = 0, protext2 = 0, protmain = 0, protfl = 0;
host_client->send_message = true;
@ -3494,7 +3493,7 @@ void SV_Rate_f (void)
{
int rate = SV_RateForClient(host_client);
if (!rate)
SV_ClientPrintf (host_client, PRINT_HIGH, "Effective rate is unlimited\n", rate);
SV_ClientPrintf (host_client, PRINT_HIGH, "Effective rate is unlimited\n");
else
SV_ClientPrintf (host_client, PRINT_HIGH, "Effective rate %i\n", rate);
return;

1
engine/server/svq2_game.c
View file

@ -550,6 +550,7 @@ static q2trace_t VARGS SVQ2_Trace (vec3_t start, vec3_t mins, vec3_t maxs, vec3_
ret.surface = tr.surface;
ret.fraction = tr.fraction;
VectorCopy(tr.endpos, ret.endpos);
memset(&ret.plane, 0, sizeof(ret.plane));
VectorCopy(tr.plane.normal, ret.plane.normal);
ret.plane.dist = tr.plane.dist;
ret.ent = tr.ent;