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

Removed moodles' infokey stuff which was totally wrong anyway.

Browse source 
Enabled the prototype warnings. Looks like we need them.
Fixed a few warnings other than the prototype ones which I just enabled.


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1898 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2006-01-28 02:35:40 +00:00
parent 9caf98dc48
commit 9620a98dc2
25 changed files with 72 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engine/server/pr_cmds.c
View file

@ -353,7 +353,7 @@ int QCEditor (progfuncs_t *prinst, char *filename, int line, int nump, char **pa
{
for (i = 0; i < line; i++)
{
VFS_GETS(buffer, sizeof(buffer), f);
VFS_GETS(f, buffer, sizeof(buffer));
}
if ((r = strchr(buffer, '\r')))
{ r[0] = '\n';r[1]='\0';}

2
engine/server/progs.h
View file

@ -118,3 +118,5 @@ qboolean PR_QCChat(char *text, int say_type);
void PR_ClientUserInfoChanged(char *name, char *oldivalue, char *newvalue);
void PR_LocalInfoChanged(char *name, char *oldivalue, char *newvalue);
void PF_InitTempStrings(progfuncs_t *prinst);

2
engine/server/server.h
View file

@ -991,6 +991,7 @@ void SV_FindModelNumbers (void);
void SVNQ_New_f (void);
void SVNQ_ExecuteClientMessage (client_t *cl);
#endif
qboolean SV_UserInfoIsBasic(char *infoname); //standard message.
void SV_ExecuteClientMessage (client_t *cl);
void SVQ2_ExecuteClientMessage (client_t *cl);
int SV_PMTypeForClient (client_t *cl);
@ -1001,6 +1002,7 @@ void SV_ClientThink (void);
void VoteFlushAll(void);
void SV_SetUpClientEdict (client_t *cl, edict_t *ent);
void SV_UpdateToReliableMessages (void);
//sv_master.c
void SVM_Think(int port);

2
engine/server/sv_ents.c
View file

@ -1811,6 +1811,8 @@ int i, eff;
float miss;
unsigned int bits=0;
int glowsize=0, glowcolor=0;
for (i=0 ; i<3 ; i++)
{
miss = ent->v->origin[i] - ent->baseline.origin[i];

1
engine/server/sv_user.c
View file

@ -1874,7 +1874,6 @@ void SV_Say (qboolean team)
{
client_t *client;
int j;
//int tmp; //unreferenced
char *p;
char text[1024];
char t1[32], *t2;

11
engine/server/svmodel.c
View file

@ -31,6 +31,12 @@ void Mod_LoadQ2BrushModel (model_t *mod, void *buffer);
void Mod_LoadAliasModel (model_t *mod, void *buffer);
model_t *Mod_LoadModel (model_t *mod, qboolean crash);
void GL_LoadQ1Model (model_t *mod, void *buffer);
void GL_LoadQ2Model (model_t *mod, void *buffer);
void GL_LoadQ3Model (model_t *mod, void *buffer);
void GLMod_LoadZymoticModel (model_t *mod, void *buffer);
void GLMod_LoadDarkPlacesModel(model_t *mod, void *buffer);
qbyte mod_novis[MAX_MAP_LEAFS/8];
#define MAX_MOD_KNOWN 512
@ -301,6 +307,11 @@ model_t *Mod_LoadModel (model_t *mod, qboolean crash)
GLMod_LoadZymoticModel(mod, buf);
break;
#endif
#ifdef ZYMOTICMODELS
case (('K'<<24)+('R'<<16)+('A'<<8)+'D'):
GLMod_LoadDarkPlacesModel(mod, buf);
break;
#endif
default:
if (crash)

12
engine/server/svq3_game.c
View file

@ -1824,7 +1824,7 @@ void SV_InitBotLib()
qboolean SVQ3_InitGame(void)
{
char buffer[8192];
int str;
char *str;
char sysinfo[8192];
extern cvar_t progs;
@ -1861,16 +1861,16 @@ qboolean SVQ3_InitGame(void)
Info_SetValueForKey(sysinfo, "sv_serverid", va("%i", svs.spawncount), MAX_SERVERINFO_STRING);
str = FS_GetPackHashes(buffer, sizeof(buffer), false);
Info_SetValueForKeyMoodles(sysinfo, "sv_paks", str, MAX_SERVERINFO_STRING); // modified to accept an integer
Info_SetValueForKey(sysinfo, "sv_paks", str, MAX_SERVERINFO_STRING);
str = FS_GetPackNames(buffer, sizeof(buffer), false);
Info_SetValueForKeyMoodles(sysinfo, "sv_pakNames", str, MAX_SERVERINFO_STRING); // modified to accept an integer
Info_SetValueForKey(sysinfo, "sv_pakNames", str, MAX_SERVERINFO_STRING);
str = FS_GetPackHashes(buffer, sizeof(buffer), true);
Info_SetValueForKeyMoodles(sysinfo, "sv_referencedPaks", str, MAX_SERVERINFO_STRING); // modified to accept an integer
Info_SetValueForKey(sysinfo, "sv_referencedPaks", str, MAX_SERVERINFO_STRING);
str = FS_GetPackNames(buffer, sizeof(buffer), true);
Info_SetValueForKeyMoodles(sysinfo, "sv_referencedPakNames", str, MAX_SERVERINFO_STRING); // modified to accept an integer
Info_SetValueForKey(sysinfo, "sv_referencedPakNames", str, MAX_SERVERINFO_STRING);
Info_SetValueForKey(sysinfo, "sv_pure", "1", MAX_SERVERINFO_STRING);
@ -1992,6 +1992,7 @@ void SVQ3_EmitPacketEntities(client_t *client, q3client_frame_t *from, q3client_
{
if(newindex >= to->num_entities)
{
newent = NULL;
newnum = 99999;
}
else
@ -2002,6 +2003,7 @@ void SVQ3_EmitPacketEntities(client_t *client, q3client_frame_t *from, q3client_
if(oldindex >= from_num_entities)
{
oldent = NULL;
oldnum = 99999;
}
else