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

Fixed a few warning messages.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1972 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2006-02-17 19:54:47 +00:00
parent d245b06c91
commit 0bd1517522
12 changed files with 123 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/client/cl_main.c
View file

@ -2940,7 +2940,7 @@ void Host_Frame (double time)
*/
Mod_Think(); //think even on idle (which means small walls and a fast cpu can get more surfaces done.
if (cl_maxfps.value>0 && cl_netfps.value>0 || cls.demoplayback)
if ((cl_maxfps.value>0 && cl_netfps.value>0) || cls.demoplayback)
{ //limit the fps freely, and expect the netfps to cope.
if ((realtime - oldrealtime) < 1/cl_maxfps.value)
return;

11
engine/client/cl_parse.c
View file

@ -512,7 +512,7 @@ void Model_NextDownload (void)
// char *twf;
char *s;
int i;
extern char gamedirfile[];
// extern char gamedirfile[];
Con_TPrintf (TLC_CHECKINGMODELS);
@ -3162,7 +3162,6 @@ char *CL_ParseChat(char *text, player_info_t **player)
int offset=0;
qboolean suppress_talksound;
char *p;
extern cvar_t cl_parsewhitetext;
char *s;
int check_flood;
@ -3482,7 +3481,7 @@ void CL_PrintChat(player_info_t *plr, char *rawmsg, char *msg, int plrflags)
{
char *t, *u;
while (t = strchr(msg, '{'))
while ((t = strchr(msg, '{')))
{
u = strchr(msg, '}');
if (u)
@ -3789,7 +3788,7 @@ void CL_ParseServerMessage (void)
if (TP_SuppressMessage(s))
break; //if this was unseen-sent from us, ignore it.
if (msg = CL_ParseChat(s, &plr))
if ((msg = CL_ParseChat(s, &plr)))
{
CL_ParsePrint(s, i);
CL_PrintChat(plr, s, msg, msgflags);
@ -4254,7 +4253,7 @@ void CLQ2_ParseServerMessage (void)
char *msg;
player_info_t *plr = NULL;
if (msg = CL_ParseChat(s, &plr))
if ((msg = CL_ParseChat(s, &plr)))
{
CL_ParsePrint(s, i);
CL_PrintChat(plr, s, msg, msgflags);
@ -4491,7 +4490,7 @@ void CLNQ_ParseServerMessage (void)
char *msg;
player_info_t *plr = NULL;
if (msg = CL_ParseChat(s+1, &plr))
if ((msg = CL_ParseChat(s+1, &plr)))
{
CL_ParsePrint(s+1, PRINT_CHAT);
CL_PrintChat(plr, s+1, msg, msgflags);

1
engine/client/clq3_parse.c
View file

@ -1027,3 +1027,4 @@ void CLQ3_SendConnectPacket(netadr_t to)
NET_SendPacket (NS_CLIENT, msg.cursize, msg.data, to);
}
#endif

2
engine/client/m_download.c
View file

@ -175,7 +175,7 @@ static void WriteInstalledPackages(void)
{
if (p->flags & DPF_HAVEAVERSION)
{
s = ("\"%s\" \"%s\" \"%s\" %i \"%s\"\n", p->fullname, p->src, p->dest, p->version, p->gamedir);
s = va("\"%s\" \"%s\" \"%s\" %i \"%s\"\n", p->fullname, p->src, p->dest, p->version, p->gamedir);
VFS_WRITE(f, s, strlen(s));
}
}

2
engine/client/m_options.c
View file

@ -427,7 +427,7 @@ void M_Menu_FPS_f (void)
#ifdef SWQUAKE
extern cvar_t d_smooth, d_mipscale, d_mipcap;
#endif
extern cvar_t r_stains, r_bloodstains, r_loadlits, r_dynamic, v_contentblend, show_fps, gl_skyboxname;
extern cvar_t r_stains, r_bloodstains, r_loadlits, r_dynamic, v_contentblend, show_fps;
key_dest = key_menu;
m_state = m_complex;

2
engine/client/menu.c
View file

@ -483,7 +483,7 @@ void M_Keys_Key (int k)
}
else if (k != '`')
{
sprintf (cmd, "bind %s \"%s\"\n", Key_KeynumToString (k), bindnames[keys_cursor].command, false);
sprintf (cmd, "bind %s \"%s\"\n", Key_KeynumToString (k), bindnames[keys_cursor].command);
Cbuf_InsertText (cmd, RESTRICT_LOCAL, false);
}

1
engine/common/vm.h
View file

@ -76,6 +76,7 @@ void VMUI_fcloseall (int owner);
int VMQ3_GetFileList(char *path, char *ext, char *output, int buffersize);
//sans botlib
struct pc_token_s;
int Script_LoadFile(char *filename);
void Script_Free(int handle);
int Script_Read(int handle, struct pc_token_s *token);

2
engine/server/pr_cmds.c
View file

@ -64,6 +64,7 @@ cvar_t pr_tempstringcount = SCVAR("pr_tempstringcount", "16");
cvar_t pr_tempstringsize = SCVAR("pr_tempstringsize", "4096");
cvar_t sv_gameplayfix_blowupfallenzombies = SCVAR("sv_gameplayfix_blowupfallenzombies", "0");
extern cvar_t sv_gameplayfix_noairborncorpse;
cvar_t sv_addon[MAXADDONS];
char cvargroup_progs[] = "Progs variables";
@ -933,6 +934,7 @@ void PR_Init(void)
Cvar_Register (&pr_tempstringsize, cvargroup_progs);
Cvar_Register (&sv_gameplayfix_blowupfallenzombies, cvargroup_progs);
Cvar_Register (&sv_gameplayfix_noairborncorpse, cvargroup_progs);
}
void Q_InitProgs(void)

2
engine/server/sv_ents.c
View file

@ -1601,7 +1601,7 @@ void SV_WritePlayersToClient (client_t *client, edict_t *clent, qbyte *pvs, size
for (j=0,cl=svs.clients ; j<sv.allocated_client_slots ; j++,cl++)
{
isbot = !cl->state && cl->name[0] || cl->protocol == SCP_BAD;
isbot = !cl->state && (cl->name[0] || cl->protocol == SCP_BAD);
if (cl->state != cs_spawned) //this includes bots
if (!isbot || progstype == PROG_QW) //unless they're NQ bots...
continue;

25
engine/server/sv_phys.c
View file

@ -52,6 +52,7 @@ cvar_t sv_airaccelerate = SCVAR( "sv_airaccelerate", "0.7");
cvar_t sv_wateraccelerate = SCVAR( "sv_wateraccelerate", "10");
cvar_t sv_friction = SCVAR( "sv_friction", "4");
cvar_t sv_waterfriction = SCVAR( "sv_waterfriction", "4");
cvar_t sv_gameplayfix_noairborncorpse = SCVAR( "sv_gameplayfix_noairborncorpse", "0");
cvar_t pm_ktjump = SCVARF("pm_ktjump", "", CVAR_SERVERINFO);
cvar_t pm_bunnyspeedcap = SCVARF("pm_bunnyspeedcap", "", CVAR_SERVERINFO);
@ -598,6 +599,8 @@ qboolean SV_PushAngles (edict_t *pusher, vec3_t move, vec3_t amove)
VectorSubtract (org2, org, move2);
VectorAdd (check->v->origin, move2, check->v->origin);
check->v->flags = (int)check->v->flags & ~FL_ONGROUND;
// may have pushed them off an edge
if (PROG_TO_EDICT(svprogfuncs, check->v->groundentity) != pusher)
check->v->groundentity = 0;
@ -740,6 +743,8 @@ qboolean SV_Push (edict_t *pusher, vec3_t move, vec3_t amove)
moved_edict[num_moved] = check;
num_moved++;
check->v->flags = (int)check->v->flags & ~FL_ONGROUND;
// try moving the contacted entity
VectorAdd (check->v->origin, move, check->v->origin);
block = SV_TestEntityPosition (check);
@ -1027,12 +1032,24 @@ void SV_Physics_Toss (edict_t *ent)
if (!SV_RunThink (ent))
return;
if (ent->v->velocity[2] > 0)
ent->v->flags = (int)ent->v->flags & ~FL_ONGROUND;
// if onground, return without moving
if ( ((int)ent->v->flags & FL_ONGROUND) )
return;
{
if (ent->v->velocity[2] > 0)
ent->v->flags = (int)ent->v->flags & ~FL_ONGROUND;
else if (ent->v->groundentity)
{
if (sv_gameplayfix_noairborncorpse.value)
{
edict_t *onent;
onent = PROG_TO_EDICT(svprogfuncs, ent->v->groundentity);
if (!onent->isfree)
return; //don't drop if our fround is still valid
}
else
return; //don't drop, even if the item we were on was removed (certain dm maps do this for q3 style stuff).
}
}
// add gravity
if (ent->v->movetype != MOVETYPE_FLY

5
engine/server/sv_send.c
View file

@ -558,6 +558,9 @@ void SV_MulticastProtExt(vec3_t origin, multicast_t to, int dimension_mask, int
case SCP_BAD:
continue; //a bot.
default:
SV_Error("Multicast: Client is using a bad protocl");
#ifdef NQPROT
case SCP_NETQUAKE:
case SCP_DARKPLACES6:
@ -672,6 +675,8 @@ void SV_MulticastProtExt(vec3_t origin, multicast_t to, int dimension_mask, int
{
case SCP_BAD:
continue; //a bot.
default:
SV_Error("multicast: Client is using a bad protocol");
#ifdef NQPROT
case SCP_NETQUAKE:

3
engine/server/sv_user.c
View file

@ -348,7 +348,6 @@ void SVNQ_New_f (void)
#ifdef Q2SERVER
void SVQ2_ConfigStrings_f (void)
{
extern int map_checksum;
int start;
char *str;
@ -447,6 +446,7 @@ void SVQ2_ConfigStrings_f (void)
}
else if (start < Q2CS_MODELS)
{
extern int map_checksum;
MSG_WriteByte (&host_client->netchan.message, svcq2_configstring);
MSG_WriteShort (&host_client->netchan.message, start);
MSG_WriteString (&host_client->netchan.message, va("%i", map_checksum));
@ -3993,7 +3993,6 @@ void SV_RunCmd (usercmd_t *ucmd, qboolean recurse)
int oldmsec;
double tmp_time;
qboolean jumpable;
extern cvar_t sv_gravity;
// DMW copied this KK hack copied from QuakeForge anti-cheat